diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp
index 9e7c2ef6465261d2baa762cb79c6e563e0388a27..809479c25e65c513edcaccdc9b401511b13e44ac 100644
--- a/src/plugins/madde/qt4maemodeployconfiguration.cpp
+++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp
@@ -78,7 +78,7 @@ Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target
     cloneSteps(source);
 }
 
-DeployConfigurationWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
+NamedWidget *Qt4MaemoDeployConfiguration::createConfigWidget()
 {
     return new RemoteLinuxDeployConfigurationWidget(this);
 }
diff --git a/src/plugins/madde/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h
index 68d16a2cb564005d5a478cb7d477c86382ae150a..989536e392b6e749776e8c5ecfcc0d65b86048bd 100644
--- a/src/plugins/madde/qt4maemodeployconfiguration.h
+++ b/src/plugins/madde/qt4maemodeployconfiguration.h
@@ -62,7 +62,7 @@ class Qt4MaemoDeployConfiguration : public RemoteLinux::RemoteLinuxDeployConfigu
 public:
     ~Qt4MaemoDeployConfiguration();
 
-    ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
+    ProjectExplorer::NamedWidget *createConfigWidget();
 
     static Core::Id fremantleWithPackagingId();
     static Core::Id fremantleWithoutPackagingId();
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index 4094d1aec76bfc04f2591ba97e9c5f8605e571a6..67af8c9aaaa45f4fedd798f606ac1df77c1d7259 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -91,7 +91,7 @@ QVariantMap DeployConfiguration::toMap() const
     return map;
 }
 
-DeployConfigurationWidget *DeployConfiguration::createConfigWidget()
+NamedWidget *DeployConfiguration::createConfigWidget()
 {
     return 0;
 }
@@ -273,10 +273,3 @@ bool DeployConfigurationFactory::canHandle(Target *parent) const
         return false;
     return DeviceTypeKitInformation::deviceTypeId(parent->kit()) == Constants::DESKTOP_DEVICE_TYPE;
 }
-
-///
-// DeployConfigurationWidget
-///
-
-DeployConfigurationWidget::DeployConfigurationWidget(QWidget *parent) : NamedWidget(parent)
-{ }
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index ec5716291935d0d437ae4deb12465c28f1d306da..cccbab08665153c9adf24447fe7dc390b9c5f351 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -44,7 +44,7 @@ namespace ProjectExplorer {
 class BuildStepList;
 class Target;
 class DeployConfigurationFactory;
-class DeployConfigurationWidget;
+class NamedWidget;
 
 class PROJECTEXPLORER_EXPORT DeployConfiguration : public ProjectConfiguration
 {
@@ -58,7 +58,7 @@ public:
 
     virtual QVariantMap toMap() const;
 
-    virtual DeployConfigurationWidget *createConfigWidget();
+    virtual NamedWidget *createConfigWidget();
 
     virtual bool isEnabled() const;
     virtual QString disabledReason() const;
@@ -124,14 +124,6 @@ protected:
 private:
 };
 
-class PROJECTEXPLORER_EXPORT DeployConfigurationWidget : public NamedWidget
-{
-    Q_OBJECT
-
-public:
-    explicit DeployConfigurationWidget(QWidget *parent = 0);
-};
-
 } // namespace ProjectExplorer
 
 Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *)
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h
index d16b98fad9141c0b516854ba02b64173d3b8babc..ada616eea8a9d590df37d75099c969e0c354765b 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.h
@@ -47,8 +47,8 @@ QT_END_NAMESPACE
 namespace ProjectExplorer {
 
 class DeployConfiguration;
-class DeployConfigurationWidget;
 class DeployConfigurationModel;
+class NamedWidget;
 class RunConfiguration;
 class RunConfigurationModel;
 class RunConfigWidget;
@@ -107,7 +107,7 @@ private:
     DeployConfigurationModel *m_deployConfigurationModel;
     QWidget *m_runConfigurationWidget;
     QVBoxLayout *m_runLayout;
-    DeployConfigurationWidget *m_deployConfigurationWidget;
+    NamedWidget *m_deployConfigurationWidget;
     QVBoxLayout *m_deployLayout;
     BuildStepListWidget *m_deploySteps;
     QMenu *m_addRunMenu;
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index ef16e6a6ada051ac6ce9189b6b281210a3ec2b00..4bee532888599bcb1cb39c0d3883241a152d76cc 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -159,7 +159,7 @@ BlackBerryDeployInformation *BlackBerryDeployConfiguration::deploymentInfo() con
     return info;
 }
 
-ProjectExplorer::DeployConfigurationWidget *BlackBerryDeployConfiguration::createConfigWidget()
+ProjectExplorer::NamedWidget *BlackBerryDeployConfiguration::createConfigWidget()
 {
     return new BlackBerryDeployConfigurationWidget(this);
 }
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.h b/src/plugins/qnx/blackberrydeployconfiguration.h
index 6432718eff6615dc8916c84ca8658721b2b4aab5..c6238eb27b43ddea64cad2db44853aff73f2f93a 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.h
+++ b/src/plugins/qnx/blackberrydeployconfiguration.h
@@ -54,7 +54,7 @@ public:
     explicit BlackBerryDeployConfiguration(ProjectExplorer::Target *parent);
     virtual ~BlackBerryDeployConfiguration();
 
-    ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
+    ProjectExplorer::NamedWidget *createConfigWidget();
 
     BlackBerryDeployInformation *deploymentInfo() const;
 
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
index 8cfb92b63d054c40935ced07b099489acaa6edb3..0f62570ead193621d49c8c3d14cc885f7a6fd136 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
@@ -45,7 +45,7 @@ using namespace Qnx::Internal;
 
 BlackBerryDeployConfigurationWidget::BlackBerryDeployConfigurationWidget(BlackBerryDeployConfiguration *dc,
                                                                          QWidget *parent)
-    : ProjectExplorer::DeployConfigurationWidget(parent)
+    : ProjectExplorer::NamedWidget(parent)
     , m_ui(new Ui::BlackBerryDeployConfigurationWidget)
     , m_deployConfiguration(0)
 {
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.h b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
index 294d43ab2e5c0fcc5e74afa44140be6cc30bf232..093ed698461b02f07f4fe351dc85fee4db0de15e 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.h
@@ -43,7 +43,7 @@ class BlackBerryDeployConfigurationWidget;
 
 class BlackBerryDeployConfiguration;
 
-class BlackBerryDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget
+class BlackBerryDeployConfigurationWidget : public ProjectExplorer::NamedWidget
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 4fefd16139d1a5c415e22bb3ce8dd1708e860277..d5f5bc8b73a57690d08deb110d653d85cc4ab8c1 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -51,7 +51,7 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
     : DeployConfiguration(target, source)
 { }
 
-DeployConfigurationWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
+NamedWidget *RemoteLinuxDeployConfiguration::createConfigWidget()
 {
     return new RemoteLinuxDeployConfigurationWidget(this);
 }
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index fe129c1319121e7832f9873c40729b2c5143b051..410cd42c3949d58572570db4014c6722fd700988 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -51,7 +51,7 @@ public:
     RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
         RemoteLinuxDeployConfiguration *source);
 
-    ProjectExplorer::DeployConfigurationWidget *createConfigWidget();
+    ProjectExplorer::NamedWidget *createConfigWidget();
 
     template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const
     {
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
index 9a0efb915c4483f1578569325b48bc34a9488116..05197c3a937b108cbce704b02c3ac6062b8d8b0b 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
@@ -55,7 +55,7 @@ using namespace Internal;
 
 RemoteLinuxDeployConfigurationWidget::RemoteLinuxDeployConfigurationWidget(RemoteLinuxDeployConfiguration *dc,
                                                                            QWidget *parent) :
-    DeployConfigurationWidget(parent), d(new RemoteLinuxDeployConfigurationWidgetPrivate)
+    NamedWidget(parent), d(new RemoteLinuxDeployConfigurationWidgetPrivate)
 {
     d->ui.setupUi(this);
     d->ui.deploymentDataView->setTextElideMode(Qt::ElideMiddle);
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index fa9a7379595474ff6eac5d0b362ce289097675e5..2571e4284c5db319f58d45e14e59cf030bb656c9 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -41,7 +41,7 @@ class RemoteLinuxDeployConfigurationWidgetPrivate;
 } // namespace Internal
 
 class REMOTELINUX_EXPORT RemoteLinuxDeployConfigurationWidget
-    : public ProjectExplorer::DeployConfigurationWidget
+    : public ProjectExplorer::NamedWidget
 {
     Q_OBJECT