diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 49d39aa6e2c..5b85ef6125a 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -32,8 +32,8 @@
 #include "abstractremotelinuxdeploystep.h"
 
 #include "abstractremotelinuxdeployservice.h"
-#include "maemodeploystepwidget.h"
 #include "remotelinuxdeployconfiguration.h"
+#include "remotelinuxdeploystepwidget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
@@ -113,7 +113,7 @@ void AbstractRemoteLinuxDeployStep::cancel()
 
 BuildStepConfigWidget *AbstractRemoteLinuxDeployStep::createConfigWidget()
 {
-    return new Internal::MaemoDeployStepBaseWidget(this);
+    return new RemoteLinuxDeployStepWidget(this);
 }
 
 RemoteLinuxDeployConfiguration *AbstractRemoteLinuxDeployStep::deployConfiguration() const
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.h b/src/plugins/remotelinux/linuxdeviceconfigurations.h
index 03a72a397fa..64b74ffe96c 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.h
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.h
@@ -47,7 +47,7 @@ namespace Internal {
 class LinuxDeviceConfigurations : public QAbstractListModel
 {
     Q_OBJECT
-    friend class MaemoDeviceConfigurationsSettingsWidget;
+    friend class LinuxDeviceConfigurationsSettingsWidget;
 public:
     static LinuxDeviceConfigurations *instance(QObject *parent = 0);
 
diff --git a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
similarity index 86%
rename from src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
rename to src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
index 20c8c12176f..fbf83ed0c1a 100644
--- a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
@@ -28,15 +28,14 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+#include "linuxdeviceconfigurationssettingswidget.h"
 
-#include "maemodeviceconfigurationssettingswidget.h"
-
-#include "ui_maemodeviceconfigurationssettingswidget.h"
+#include "ui_linuxdeviceconfigurationssettingswidget.h"
 
 #include "linuxdeviceconfigurations.h"
 #include "linuxdevicefactoryselectiondialog.h"
 #include "maemoglobal.h"
-#include "maemosshconfigdialog.h"
+#include "sshkeycreationdialog.h"
 
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
@@ -96,9 +95,9 @@ private:
 };
 
 
-MaemoDeviceConfigurationsSettingsWidget::MaemoDeviceConfigurationsSettingsWidget(QWidget *parent)
+LinuxDeviceConfigurationsSettingsWidget::LinuxDeviceConfigurationsSettingsWidget(QWidget *parent)
     : QWidget(parent),
-      m_ui(new Ui_MaemoDeviceConfigurationsSettingsWidget),
+      m_ui(new Ui_LinuxDeviceConfigurationsSettingsWidget),
       m_devConfigs(LinuxDeviceConfigurations::cloneInstance()),
       m_nameValidator(new NameValidator(m_devConfigs.data(), this)),
       m_saveSettingsRequested(false),
@@ -109,7 +108,7 @@ MaemoDeviceConfigurationsSettingsWidget::MaemoDeviceConfigurationsSettingsWidget
         SLOT(handleAdditionalActionRequest(QString)));
 }
 
-MaemoDeviceConfigurationsSettingsWidget::~MaemoDeviceConfigurationsSettingsWidget()
+LinuxDeviceConfigurationsSettingsWidget::~LinuxDeviceConfigurationsSettingsWidget()
 {
     if (m_saveSettingsRequested) {
         Core::ICore::instance()->settings()->setValue(LastDeviceConfigIndexKey,
@@ -119,7 +118,7 @@ MaemoDeviceConfigurationsSettingsWidget::~MaemoDeviceConfigurationsSettingsWidge
     delete m_ui;
 }
 
-QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
+QString LinuxDeviceConfigurationsSettingsWidget::searchKeywords() const
 {
     QString rc;
     QTextStream(&rc) << m_ui->configurationLabel->text()
@@ -145,7 +144,7 @@ QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
     return rc;
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::initGui()
+void LinuxDeviceConfigurationsSettingsWidget::initGui()
 {
     m_ui->setupUi(this);
     m_ui->configurationComboBox->setModel(m_devConfigs.data());
@@ -169,7 +168,7 @@ void MaemoDeviceConfigurationsSettingsWidget::initGui()
         SLOT(setDefaultDevice()));
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::addConfig()
+void LinuxDeviceConfigurationsSettingsWidget::addConfig()
 {
     const QList<ILinuxDeviceConfigurationFactory *> &factories
         = ExtensionSystem::PluginManager::instance()->getObjects<ILinuxDeviceConfigurationFactory>();
@@ -190,14 +189,14 @@ void MaemoDeviceConfigurationsSettingsWidget::addConfig()
     m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::deleteConfig()
+void LinuxDeviceConfigurationsSettingsWidget::deleteConfig()
 {
     m_devConfigs->removeConfiguration(currentIndex());
     if (m_devConfigs->rowCount() == 0)
         currentConfigChanged(-1);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
+void LinuxDeviceConfigurationsSettingsWidget::displayCurrent()
 {
     const LinuxDeviceConfiguration::ConstPtr &current = currentConfig();
     m_ui->defaultDeviceButton->setEnabled(!current->isDefault());
@@ -220,7 +219,7 @@ void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
     fillInValues();
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::fillInValues()
+void LinuxDeviceConfigurationsSettingsWidget::fillInValues()
 {
     const LinuxDeviceConfiguration::ConstPtr &current = currentConfig();
     m_ui->nameLineEdit->setText(current->name());
@@ -239,24 +238,24 @@ void MaemoDeviceConfigurationsSettingsWidget::fillInValues()
     m_ui->sshPortSpinBox->setReadOnly(isSimulator);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::saveSettings()
+void LinuxDeviceConfigurationsSettingsWidget::saveSettings()
 {
     // We must defer this step because of a stupid bug on MacOS. See QTCREATORBUG-1675.
     m_saveSettingsRequested = true;
 }
 
-int MaemoDeviceConfigurationsSettingsWidget::currentIndex() const
+int LinuxDeviceConfigurationsSettingsWidget::currentIndex() const
 {
     return m_ui->configurationComboBox->currentIndex();
 }
 
-LinuxDeviceConfiguration::ConstPtr MaemoDeviceConfigurationsSettingsWidget::currentConfig() const
+LinuxDeviceConfiguration::ConstPtr LinuxDeviceConfigurationsSettingsWidget::currentConfig() const
 {
     Q_ASSERT(currentIndex() != -1);
     return m_devConfigs->deviceAt(currentIndex());
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::configNameEditingFinished()
 {
     if (m_ui->configurationComboBox->count() == 0)
         return;
@@ -266,7 +265,7 @@ void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
     m_nameValidator->setDisplayName(newName);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
+void LinuxDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     const bool usePassword = m_ui->passwordButton->isChecked();
@@ -281,84 +280,84 @@ void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
     m_ui->makeKeyFileDefaultButton->setEnabled(!usePassword);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::hostNameEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::hostNameEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.host = m_ui->hostLineEdit->text();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::sshPortEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::sshPortEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.port = m_ui->sshPortSpinBox->value();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::timeoutEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::timeoutEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.timeout = m_ui->timeoutSpinBox->value();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::userNameEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::userNameEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.userName = m_ui->userLineEdit->text();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::passwordEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::passwordEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.password = m_ui->pwdLineEdit->text();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::keyFileEditingFinished()
+void LinuxDeviceConfigurationsSettingsWidget::keyFileEditingFinished()
 {
     SshConnectionParameters sshParams = currentConfig()->sshParameters();
     sshParams.privateKeyFile = m_ui->keyFileLineEdit->path();
     m_devConfigs->setSshParameters(currentIndex(), sshParams);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::handleFreePortsChanged()
+void LinuxDeviceConfigurationsSettingsWidget::handleFreePortsChanged()
 {
     m_devConfigs->setFreePorts(currentIndex(), PortList::fromString(m_ui->portsLineEdit->text()));
     updatePortsWarningLabel();
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::showPassword(bool showClearText)
+void LinuxDeviceConfigurationsSettingsWidget::showPassword(bool showClearText)
 {
     m_ui->pwdLineEdit->setEchoMode(showClearText
         ? QLineEdit::Normal : QLineEdit::Password);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::showGenerateSshKeyDialog()
+void LinuxDeviceConfigurationsSettingsWidget::showGenerateSshKeyDialog()
 {
-    MaemoSshConfigDialog dialog(this);
+    SshKeyCreationDialog dialog(this);
     dialog.exec();
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::setDefaultKeyFilePath()
+void LinuxDeviceConfigurationsSettingsWidget::setDefaultKeyFilePath()
 {
     m_devConfigs->setDefaultSshKeyFilePath(m_ui->keyFileLineEdit->path());
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::setDefaultDevice()
+void LinuxDeviceConfigurationsSettingsWidget::setDefaultDevice()
 {
     m_devConfigs->setDefaultDevice(currentIndex());
     m_ui->defaultDeviceButton->setEnabled(false);
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::setPrivateKey(const QString &path)
+void LinuxDeviceConfigurationsSettingsWidget::setPrivateKey(const QString &path)
 {
     m_ui->keyFileLineEdit->setPath(path);
     keyFileEditingFinished();
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
+void LinuxDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
 {
     qDeleteAll(m_additionalActionButtons);
     m_additionalActionButtons.clear();
@@ -387,7 +386,7 @@ void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
     }
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::clearDetails()
+void LinuxDeviceConfigurationsSettingsWidget::clearDetails()
 {
     m_ui->nameLineEdit->clear();
     m_ui->osTypeValueLabel->clear();
@@ -402,7 +401,7 @@ void MaemoDeviceConfigurationsSettingsWidget::clearDetails()
     m_ui->keyFileLineEdit->lineEdit()->clear();
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
+void LinuxDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
 {
     if (currentConfig()->freePorts().hasMore()) {
         m_ui->portsWarningLabel->clear();
@@ -412,7 +411,7 @@ void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
     }
 }
 
-const ILinuxDeviceConfigurationFactory *MaemoDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const
+const ILinuxDeviceConfigurationFactory *LinuxDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const
 {
     Q_ASSERT(currentConfig());
     const QList<ILinuxDeviceConfigurationFactory *> &factories
@@ -424,7 +423,7 @@ const ILinuxDeviceConfigurationFactory *MaemoDeviceConfigurationsSettingsWidget:
     return 0;
 }
 
-void MaemoDeviceConfigurationsSettingsWidget::handleAdditionalActionRequest(const QString &actionId)
+void LinuxDeviceConfigurationsSettingsWidget::handleAdditionalActionRequest(const QString &actionId)
 {
     const ILinuxDeviceConfigurationFactory * const factory = factoryForCurrentConfig();
     Q_ASSERT(factory);
diff --git a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h
similarity index 87%
rename from src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
rename to src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h
index e405053d345..8061076191f 100644
--- a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.h
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h
@@ -29,8 +29,8 @@
 **
 **************************************************************************/
 
-#ifndef MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
-#define MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
+#ifndef LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
+#define LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
 
 #include <QtCore/QList>
 #include <QtCore/QScopedPointer>
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QSignalMapper;
 
-class Ui_MaemoDeviceConfigurationsSettingsWidget;
+class Ui_LinuxDeviceConfigurationsSettingsWidget;
 QT_END_NAMESPACE
 
 namespace RemoteLinux {
@@ -54,12 +54,12 @@ namespace Internal {
 class NameValidator;
 class LinuxDeviceConfigurations;
 
-class MaemoDeviceConfigurationsSettingsWidget : public QWidget
+class LinuxDeviceConfigurationsSettingsWidget : public QWidget
 {
     Q_OBJECT
 public:
-    MaemoDeviceConfigurationsSettingsWidget(QWidget *parent);
-    ~MaemoDeviceConfigurationsSettingsWidget();
+    LinuxDeviceConfigurationsSettingsWidget(QWidget *parent);
+    ~LinuxDeviceConfigurationsSettingsWidget();
 
     void saveSettings();
     QString searchKeywords() const;
@@ -97,7 +97,7 @@ private:
     void updatePortsWarningLabel();
     const ILinuxDeviceConfigurationFactory *factoryForCurrentConfig() const;
 
-    Ui_MaemoDeviceConfigurationsSettingsWidget *m_ui;
+    Ui_LinuxDeviceConfigurationsSettingsWidget *m_ui;
     const QScopedPointer<LinuxDeviceConfigurations> m_devConfigs;
     NameValidator * const m_nameValidator;
     bool m_saveSettingsRequested;
@@ -108,4 +108,4 @@ private:
 } // namespace Internal
 } // namespace RemoteLinux
 
-#endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
+#endif // LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
diff --git a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
similarity index 94%
rename from src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui
rename to src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
index 83928a2e05b..7d45a951627 100644
--- a/src/plugins/remotelinux/maemodeviceconfigurationssettingswidget.ui
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MaemoDeviceConfigurationsSettingsWidget</class>
- <widget class="QWidget" name="MaemoDeviceConfigurationsSettingsWidget">
+ <class>LinuxDeviceConfigurationsSettingsWidget</class>
+ <widget class="QWidget" name="LinuxDeviceConfigurationsSettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>708</width>
+    <width>726</width>
     <height>421</height>
    </rect>
   </property>
@@ -457,7 +457,7 @@
   <connection>
    <sender>hostLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>hostNameEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -473,7 +473,7 @@
   <connection>
    <sender>userLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>userNameEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -489,7 +489,7 @@
   <connection>
    <sender>pwdLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>passwordEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -505,7 +505,7 @@
   <connection>
    <sender>addConfigButton</sender>
    <signal>clicked()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>addConfig()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -521,7 +521,7 @@
   <connection>
    <sender>passwordButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>authenticationTypeChanged()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -537,7 +537,7 @@
   <connection>
    <sender>keyFileLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>keyFileEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -553,7 +553,7 @@
   <connection>
    <sender>keyFileLineEdit</sender>
    <signal>browsingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>keyFileEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -569,7 +569,7 @@
   <connection>
    <sender>keyButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>authenticationTypeChanged()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -585,7 +585,7 @@
   <connection>
    <sender>nameLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>configNameEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -601,7 +601,7 @@
   <connection>
    <sender>generateKeyButton</sender>
    <signal>clicked()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>showGenerateSshKeyDialog()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -617,7 +617,7 @@
   <connection>
    <sender>timeoutSpinBox</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>timeoutEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -633,7 +633,7 @@
   <connection>
    <sender>timeoutSpinBox</sender>
    <signal>valueChanged(int)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>timeoutEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -649,7 +649,7 @@
   <connection>
    <sender>sshPortSpinBox</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>sshPortEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -665,7 +665,7 @@
   <connection>
    <sender>sshPortSpinBox</sender>
    <signal>valueChanged(int)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>sshPortEditingFinished()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -681,7 +681,7 @@
   <connection>
    <sender>showPasswordCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>showPassword(bool)</slot>
    <hints>
     <hint type="sourcelabel">
@@ -697,7 +697,7 @@
   <connection>
    <sender>portsLineEdit</sender>
    <signal>editingFinished()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>handleFreePortsChanged()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -713,7 +713,7 @@
   <connection>
    <sender>removeConfigButton</sender>
    <signal>clicked()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+   <receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
    <slot>deleteConfig()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp b/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
index a55ef13eb9a..91b5f7717b4 100644
--- a/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
@@ -37,9 +37,9 @@
 #include "deploymentinfo.h"
 #include "linuxdeviceconfigurations.h"
 #include "maemoglobal.h"
-#include "maemopertargetdeviceconfigurationlistmodel.h"
 #include "maemosettingspages.h"
 #include "remotelinuxdeployconfiguration.h"
+#include "typespecificdeviceconfigurationlistmodel.h"
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
index 551c467edd3..bd3036ab4d7 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
+++ b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
@@ -38,10 +38,10 @@
 
 #include "maddedevicetester.h"
 #include "maemoglobal.h"
-#include "maemokeydeployer.h"
 
 #include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h>
 #include <remotelinux/linuxdevicetestdialog.h>
+#include <remotelinux/sshkeydeployer.h>
 #include <utils/fileutils.h>
 #include <utils/ssh/sshkeygenerator.h>
 
@@ -395,7 +395,7 @@ public:
             : QWizardPage(parent),
               m_ui(new Ui::MaemoDeviceConfigWizardKeyDeploymentPage),
               m_wizardData(wizardData),
-              m_keyDeployer(new MaemoKeyDeployer(this))
+              m_keyDeployer(new SshKeyDeployer(this))
     {
         m_ui->setupUi(this);
         m_instructionTextTemplate = m_ui->instructionLabel->text();
@@ -486,7 +486,7 @@ private:
     const QScopedPointer<Ui::MaemoDeviceConfigWizardKeyDeploymentPage> m_ui;
     bool m_isComplete;
     const WizardData &m_wizardData;
-    MaemoKeyDeployer * const m_keyDeployer;
+    SshKeyDeployer * const m_keyDeployer;
     QString m_instructionTextTemplate;
 };
 
diff --git a/src/plugins/remotelinux/maemosettingspages.cpp b/src/plugins/remotelinux/maemosettingspages.cpp
index e22c78b2955..9dcbde29250 100644
--- a/src/plugins/remotelinux/maemosettingspages.cpp
+++ b/src/plugins/remotelinux/maemosettingspages.cpp
@@ -31,8 +31,8 @@
 
 #include "maemosettingspages.h"
 
+#include "linuxdeviceconfigurationssettingswidget.h"
 #include "maemoconstants.h"
-#include "maemodeviceconfigurationssettingswidget.h"
 #include "maemoqemusettings.h"
 #include "maemoqemusettingswidget.h"
 
@@ -144,7 +144,7 @@ bool MaemoDeviceConfigurationsSettingsPage::matches(const QString &searchKeyWord
 
 QWidget *MaemoDeviceConfigurationsSettingsPage::createPage(QWidget *parent)
 {
-    m_widget = new MaemoDeviceConfigurationsSettingsWidget(parent);
+    m_widget = new LinuxDeviceConfigurationsSettingsWidget(parent);
     if (m_keywords.isEmpty())
         m_keywords = m_widget->searchKeywords();
     return m_widget;
diff --git a/src/plugins/remotelinux/maemosettingspages.h b/src/plugins/remotelinux/maemosettingspages.h
index 8feff817129..7156257611a 100644
--- a/src/plugins/remotelinux/maemosettingspages.h
+++ b/src/plugins/remotelinux/maemosettingspages.h
@@ -37,7 +37,7 @@
 namespace RemoteLinux{
 namespace Internal {
 
-class MaemoDeviceConfigurationsSettingsWidget;
+class LinuxDeviceConfigurationsSettingsWidget;
 class MaemoQemuSettingsWidget;
 
 class MaemoDeviceConfigurationsSettingsPage : public Core::IOptionsPage
@@ -62,7 +62,7 @@ public:
 
 private:
     QString m_keywords;
-    MaemoDeviceConfigurationsSettingsWidget *m_widget;
+    LinuxDeviceConfigurationsSettingsWidget *m_widget;
 };
 
 class MaemoQemuSettingsPage : public Core::IOptionsPage
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 5107b867af6..28e2a36290d 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -31,7 +31,7 @@
 #include "publickeydeploymentdialog.h"
 
 #include "linuxdeviceconfiguration.h"
-#include "maemokeydeployer.h"
+#include "sshkeydeployer.h"
 
 #include <QtGui/QFileDialog>
 
@@ -40,7 +40,7 @@ namespace Internal {
 class PublicKeyDeploymentDialogPrivate
 {
 public:
-    MaemoKeyDeployer *keyDeployer;
+    SshKeyDeployer *keyDeployer;
     bool done;
 };
 } // namespace Internal;
@@ -56,7 +56,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const LinuxDeviceConfigurat
     setMinimumDuration(0);
     setMaximum(1);
 
-    m_d->keyDeployer = new MaemoKeyDeployer(this);
+    m_d->keyDeployer = new SshKeyDeployer(this);
     m_d->done = false;
 
     setLabelText(tr("Waiting for file name..."));
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index b564ef7ebdb..95923694a6f 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -12,20 +12,16 @@ HEADERS += \
     maemoruncontrol.h \
     maemorunfactories.h \
     maemosettingspages.h \
-    maemodeviceconfigurationssettingswidget.h \
-    maemosshconfigdialog.h \
     maemotoolchain.h \
     maemopackagecreationstep.h \
     maemopackagecreationfactory.h \
     maemopackagecreationwidget.h \
     maemoqemumanager.h \
-    maemodeploystepwidget.h \
     maemodeploystepfactory.h \
     maemoglobal.h \
     maemosshrunner.h \
     maemodebugsupport.h \
     maemoremotemountsmodel.h \
-    maemodeviceenvreader.h \
     maemomountspecification.h \
     maemoremotemounter.h \
     maemoprofilesupdatedialog.h \
@@ -46,8 +42,6 @@ HEADERS += \
     qt4maemotarget.h \
     qt4maemodeployconfiguration.h \
     maemodeviceconfigwizard.h \
-    maemokeydeployer.h \
-    maemopertargetdeviceconfigurationlistmodel.h \
     maemodeployconfigurationwidget.h \
     maemoinstalltosysrootstep.h \
     maemodeploymentmounter.h \
@@ -96,7 +90,13 @@ HEADERS += \
     linuxdevicetestdialog.h \
     remotelinuxprocesslist.h \
     madderemoteprocesslist.h \
-    remotelinuxprocessesdialog.h
+    remotelinuxprocessesdialog.h \
+    remotelinuxdeploystepwidget.h \
+    linuxdeviceconfigurationssettingswidget.h \
+    remotelinuxenvironmentreader.h \
+    sshkeydeployer.h \
+    typespecificdeviceconfigurationlistmodel.h \
+    sshkeycreationdialog.h
 
 SOURCES += \
     remotelinuxplugin.cpp \
@@ -104,20 +104,16 @@ SOURCES += \
     maemoruncontrol.cpp \
     maemorunfactories.cpp \
     maemosettingspages.cpp \
-    maemodeviceconfigurationssettingswidget.cpp \
-    maemosshconfigdialog.cpp \
     maemotoolchain.cpp \
     maemopackagecreationstep.cpp \
     maemopackagecreationfactory.cpp \
     maemopackagecreationwidget.cpp \
     maemoqemumanager.cpp \
-    maemodeploystepwidget.cpp \
     maemodeploystepfactory.cpp \
     maemoglobal.cpp \
     maemosshrunner.cpp \
     maemodebugsupport.cpp \
     maemoremotemountsmodel.cpp \
-    maemodeviceenvreader.cpp \
     maemomountspecification.cpp \
     maemoremotemounter.cpp \
     maemoprofilesupdatedialog.cpp \
@@ -137,8 +133,6 @@ SOURCES += \
     qt4maemotarget.cpp \
     qt4maemodeployconfiguration.cpp \
     maemodeviceconfigwizard.cpp \
-    maemokeydeployer.cpp \
-    maemopertargetdeviceconfigurationlistmodel.cpp \
     maemodeployconfigurationwidget.cpp \
     maemoinstalltosysrootstep.cpp \
     maemodeploymentmounter.cpp \
@@ -185,11 +179,15 @@ SOURCES += \
     linuxdevicetestdialog.cpp \
     remotelinuxprocesslist.cpp \
     madderemoteprocesslist.cpp \
-    remotelinuxprocessesdialog.cpp
+    remotelinuxprocessesdialog.cpp \
+    remotelinuxdeploystepwidget.cpp \
+    linuxdeviceconfigurationssettingswidget.cpp \
+    remotelinuxenvironmentreader.cpp \
+    sshkeydeployer.cpp \
+    typespecificdeviceconfigurationlistmodel.cpp \
+    sshkeycreationdialog.cpp
 
 FORMS += \
-    maemodeviceconfigurationssettingswidget.ui \
-    maemosshconfigdialog.ui \
     maemopackagecreationwidget.ui \
     maemoprofilesupdatedialog.ui \
     maemopublishingbuildsettingspagefremantlefree.ui \
@@ -206,7 +204,9 @@ FORMS += \
     linuxdevicefactoryselectiondialog.ui \
     genericlinuxdeviceconfigurationwizardsetuppage.ui \
     linuxdevicetestdialog.ui \
-    remotelinuxprocessesdialog.ui
+    remotelinuxprocessesdialog.ui \
+    linuxdeviceconfigurationssettingswidget.ui \
+    sshkeycreationdialog.ui
 
 RESOURCES += qt-maemo.qrc
 DEFINES += QT_NO_CAST_TO_ASCII
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index d1ad7ea3766..a807aba2381 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -34,7 +34,7 @@
 #include "deploymentinfo.h"
 #include "linuxdeviceconfigurations.h"
 #include "maemodeployconfigurationwidget.h"
-#include "maemopertargetdeviceconfigurationlistmodel.h"
+#include "typespecificdeviceconfigurationlistmodel.h"
 
 #include <qt4projectmanager/qt4target.h>
 
@@ -73,8 +73,8 @@ RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::
     }
     if (!m_deploymentInfo) {
         m_deploymentInfo = QSharedPointer<DeploymentInfo>(new DeploymentInfo(qobject_cast<Qt4BaseTarget *>(target)));
-        m_devConfModel = QSharedPointer<MaemoPerTargetDeviceConfigurationListModel>
-            (new MaemoPerTargetDeviceConfigurationListModel(0, supportedOsType));
+        m_devConfModel = QSharedPointer<TypeSpecificDeviceConfigurationListModel>
+            (new TypeSpecificDeviceConfigurationListModel(0, supportedOsType));
     }
 
     initialize();
@@ -145,7 +145,7 @@ QSharedPointer<DeploymentInfo> RemoteLinuxDeployConfiguration::deploymentInfo()
     return m_deploymentInfo;
 }
 
-QSharedPointer<MaemoPerTargetDeviceConfigurationListModel> RemoteLinuxDeployConfiguration::deviceConfigModel() const
+QSharedPointer<TypeSpecificDeviceConfigurationListModel> RemoteLinuxDeployConfiguration::deviceConfigModel() const
 {
     return m_devConfModel;
 }
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index 188cdf179b0..2a817f68548 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -43,7 +43,7 @@ namespace RemoteLinux {
 class DeploymentInfo;
 
 namespace Internal {
-class MaemoPerTargetDeviceConfigurationListModel;
+class TypeSpecificDeviceConfigurationListModel;
 } // namespace Internal
 
 class REMOTELINUX_EXPORT RemoteLinuxDeployConfiguration
@@ -63,7 +63,7 @@ public:
 
     void setDeviceConfiguration(int index);
     QSharedPointer<DeploymentInfo> deploymentInfo() const;
-    QSharedPointer<Internal::MaemoPerTargetDeviceConfigurationListModel> deviceConfigModel() const;
+    QSharedPointer<Internal::TypeSpecificDeviceConfigurationListModel> deviceConfigModel() const;
     QSharedPointer<const LinuxDeviceConfiguration> deviceConfiguration() const;
 
 signals:
@@ -78,7 +78,7 @@ private:
     Q_SLOT void handleDeviceConfigurationListUpdated();
 
     QSharedPointer<DeploymentInfo> m_deploymentInfo;
-    QSharedPointer<Internal::MaemoPerTargetDeviceConfigurationListModel> m_devConfModel;
+    QSharedPointer<Internal::TypeSpecificDeviceConfigurationListModel> m_devConfModel;
     QSharedPointer<const LinuxDeviceConfiguration> m_deviceConfiguration;
 };
 
diff --git a/src/plugins/remotelinux/maemodeploystepwidget.cpp b/src/plugins/remotelinux/remotelinuxdeploystepwidget.cpp
similarity index 84%
rename from src/plugins/remotelinux/maemodeploystepwidget.cpp
rename to src/plugins/remotelinux/remotelinuxdeploystepwidget.cpp
index 19e3c2d0893..6986ff25f1e 100644
--- a/src/plugins/remotelinux/maemodeploystepwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeploystepwidget.cpp
@@ -29,23 +29,18 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-#include "maemodeploystepwidget.h"
+#include "remotelinuxdeploystepwidget.h"
 
 #include "abstractremotelinuxdeploystep.h"
 #include "maemoglobal.h"
-#include "qt4maemodeployconfiguration.h"
-
-#include <projectexplorer/buildconfiguration.h>
-#include <utils/qtcassert.h>
-
-#include <QtGui/QVBoxLayout>
+#include "remotelinuxdeployconfiguration.h"
 
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {
-namespace Internal {
+using namespace Internal;
 
-MaemoDeployStepBaseWidget::MaemoDeployStepBaseWidget(AbstractRemoteLinuxDeployStep *step)
+RemoteLinuxDeployStepWidget::RemoteLinuxDeployStepWidget(AbstractRemoteLinuxDeployStep *step)
     : m_step(step)
 {
     BuildStepList * const list = step->deployConfiguration()->stepList();
@@ -60,11 +55,11 @@ MaemoDeployStepBaseWidget::MaemoDeployStepBaseWidget(AbstractRemoteLinuxDeploySt
         SIGNAL(updateSummary()));
 }
 
-MaemoDeployStepBaseWidget::~MaemoDeployStepBaseWidget()
+RemoteLinuxDeployStepWidget::~RemoteLinuxDeployStepWidget()
 {
 }
 
-void MaemoDeployStepBaseWidget::handleStepToBeRemoved(int step)
+void RemoteLinuxDeployStepWidget::handleStepToBeRemoved(int step)
 {
     BuildStepList * const list = m_step->deployConfiguration()->stepList();
     const AbstractRemoteLinuxDeployStep * const alds
@@ -73,7 +68,7 @@ void MaemoDeployStepBaseWidget::handleStepToBeRemoved(int step)
         disconnect(list, 0, this, 0);
 }
 
-QString MaemoDeployStepBaseWidget::summaryText() const
+QString RemoteLinuxDeployStepWidget::summaryText() const
 {
     QString error;
     if (!m_step->isDeploymentPossible(&error)) {
@@ -85,5 +80,4 @@ QString MaemoDeployStepBaseWidget::summaryText() const
         MaemoGlobal::deviceConfigurationName(m_step->deployConfiguration()->deviceConfiguration()));
 }
 
-} // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/maemodeploystepwidget.h b/src/plugins/remotelinux/remotelinuxdeploystepwidget.h
similarity index 79%
rename from src/plugins/remotelinux/maemodeploystepwidget.h
rename to src/plugins/remotelinux/remotelinuxdeploystepwidget.h
index dacde584ffc..12fb9079296 100644
--- a/src/plugins/remotelinux/maemodeploystepwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeploystepwidget.h
@@ -30,22 +30,23 @@
 **
 **************************************************************************/
 
-#ifndef MAEMODEPLOYSTEPWIDGET_H
-#define MAEMODEPLOYSTEPWIDGET_H
+#ifndef REMOTELINUXDEPLOYSTEPWIDGET_H
+#define REMOTELINUXDEPLOYSTEPWIDGET_H
+
+#include "remotelinux_export.h"
 
 #include <projectexplorer/buildstep.h>
 
 namespace RemoteLinux {
 class AbstractRemoteLinuxDeployStep;
-namespace Internal {
 
-class MaemoDeployStepBaseWidget : public ProjectExplorer::BuildStepConfigWidget
+class REMOTELINUX_EXPORT RemoteLinuxDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
 
 public:
-    MaemoDeployStepBaseWidget(AbstractRemoteLinuxDeployStep *step);
-    ~MaemoDeployStepBaseWidget();
+    RemoteLinuxDeployStepWidget(AbstractRemoteLinuxDeployStep *step);
+    ~RemoteLinuxDeployStepWidget();
 
     QString summaryText() const;
     QString displayName() const { return QString(); }
@@ -53,10 +54,9 @@ public:
 private:
     Q_SLOT void handleStepToBeRemoved(int step);
 
-    AbstractRemoteLinuxDeployStep *const m_step;
+    AbstractRemoteLinuxDeployStep * const m_step;
 };
 
-} // namespace Internal
 } // namespace RemoteLinux
 
-#endif // MAEMODEPLOYSTEPWIDGET_H
+#endif // REMOTELINUXDEPLOYSTEPWIDGET_H
diff --git a/src/plugins/remotelinux/maemodeviceenvreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
similarity index 85%
rename from src/plugins/remotelinux/maemodeviceenvreader.cpp
rename to src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index c1adec59bf4..70ea6b0c836 100644
--- a/src/plugins/remotelinux/maemodeviceenvreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -28,8 +28,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-
-#include "maemodeviceenvreader.h"
+#include "remotelinuxenvironmentreader.h"
 
 #include "linuxdeviceconfiguration.h"
 #include "maemoglobal.h"
@@ -38,9 +37,9 @@
 #include <utils/ssh/sshremoteprocessrunner.h>
 
 namespace RemoteLinux {
-    namespace Internal {
+namespace Internal {
 
-MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, RemoteLinuxRunConfiguration *config)
+RemoteLinuxEnvironmentReader::RemoteLinuxEnvironmentReader(QObject *parent, RemoteLinuxRunConfiguration *config)
     : QObject(parent)
     , m_stop(false)
     , m_devConfig(config->deviceConfig())
@@ -50,11 +49,11 @@ MaemoDeviceEnvReader::MaemoDeviceEnvReader(QObject *parent, RemoteLinuxRunConfig
         this, SLOT(handleCurrentDeviceConfigChanged()));
 }
 
-MaemoDeviceEnvReader::~MaemoDeviceEnvReader()
+RemoteLinuxEnvironmentReader::~RemoteLinuxEnvironmentReader()
 {
 }
 
-void MaemoDeviceEnvReader::start()
+void RemoteLinuxEnvironmentReader::start()
 {
     if (!m_devConfig)
         return;
@@ -82,14 +81,14 @@ void MaemoDeviceEnvReader::start()
     m_remoteProcessRunner->run(remoteCall);
 }
 
-void MaemoDeviceEnvReader::stop()
+void RemoteLinuxEnvironmentReader::stop()
 {
     m_stop = true;
     if (m_remoteProcessRunner)
         disconnect(m_remoteProcessRunner.data(), 0, this, 0);
 }
 
-void MaemoDeviceEnvReader::handleConnectionFailure()
+void RemoteLinuxEnvironmentReader::handleConnectionFailure()
 {
     if (m_stop)
         return;
@@ -100,7 +99,7 @@ void MaemoDeviceEnvReader::handleConnectionFailure()
     emit finished();
 }
 
-void MaemoDeviceEnvReader::handleCurrentDeviceConfigChanged()
+void RemoteLinuxEnvironmentReader::handleCurrentDeviceConfigChanged()
 {
     m_devConfig = m_runConfig->deviceConfig();
 
@@ -110,7 +109,7 @@ void MaemoDeviceEnvReader::handleCurrentDeviceConfigChanged()
     setFinished();
 }
 
-void MaemoDeviceEnvReader::remoteProcessFinished(int exitCode)
+void RemoteLinuxEnvironmentReader::remoteProcessFinished(int exitCode)
 {
     Q_ASSERT(exitCode == Utils::SshRemoteProcess::FailedToStart
         || exitCode == Utils::SshRemoteProcess::KilledBySignal
@@ -138,21 +137,21 @@ void MaemoDeviceEnvReader::remoteProcessFinished(int exitCode)
     setFinished();
 }
 
-void MaemoDeviceEnvReader::remoteOutput(const QByteArray &data)
+void RemoteLinuxEnvironmentReader::remoteOutput(const QByteArray &data)
 {
     m_remoteOutput.append(QString::fromUtf8(data));
 }
 
-void MaemoDeviceEnvReader::remoteErrorOutput(const QByteArray &data)
+void RemoteLinuxEnvironmentReader::remoteErrorOutput(const QByteArray &data)
 {
     m_remoteErrorOutput += data;
 }
 
-void MaemoDeviceEnvReader::setFinished()
+void RemoteLinuxEnvironmentReader::setFinished()
 {
     stop();
     emit finished();
 }
 
-}   // Internal
-}   // Qt4ProjectManager
+} // namespace Internal
+} // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/maemodeviceenvreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
similarity index 85%
rename from src/plugins/remotelinux/maemodeviceenvreader.h
rename to src/plugins/remotelinux/remotelinuxenvironmentreader.h
index a6efb3f9bb1..94342d2ec14 100644
--- a/src/plugins/remotelinux/maemodeviceenvreader.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
@@ -29,8 +29,8 @@
 **
 **************************************************************************/
 
-#ifndef DEVICEENVREADER_H
-#define DEVICEENVREADER_H
+#ifndef REMOTELINUXENVIRONMENTREADER_H
+#define REMOTELINUXENVIRONMENTREADER_H
 
 #include <utils/environment.h>
 
@@ -38,7 +38,7 @@
 #include <QtCore/QSharedPointer>
 
 namespace Utils {
-    class SshRemoteProcessRunner;
+class SshRemoteProcessRunner;
 }
 
 namespace RemoteLinux {
@@ -47,12 +47,12 @@ class RemoteLinuxRunConfiguration;
 
 namespace Internal {
 
-class MaemoDeviceEnvReader : public QObject
+class RemoteLinuxEnvironmentReader : public QObject
 {
     Q_OBJECT
 public:
-    MaemoDeviceEnvReader(QObject *parent, RemoteLinuxRunConfiguration *config);
-    ~MaemoDeviceEnvReader();
+    RemoteLinuxEnvironmentReader(QObject *parent, RemoteLinuxRunConfiguration *config);
+    ~RemoteLinuxEnvironmentReader();
 
     void start();
     void stop();
@@ -83,7 +83,7 @@ private:
     QSharedPointer<Utils::SshRemoteProcessRunner> m_remoteProcessRunner;
 };
 
-    }   // Internal
-}   // Qt4ProjectManager
+} // namespace Internal
+} // namespace RemoteLinux
 
-#endif  // DEVICEENVREADER_H
+#endif  // REMOTELINUXENVIRONMENTREADER_H
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
index c44d4a30d10..bc37136e593 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
@@ -31,11 +31,10 @@
 **************************************************************************/
 #include "remotelinuxrunconfigurationwidget.h"
 
-#include "maemodeviceenvreader.h"
 #include "maemoglobal.h"
 #include "remotelinuxrunconfiguration.h"
 #include "maemosettingspages.h"
-#include "qt4maemodeployconfiguration.h"
+#include "remotelinuxenvironmentreader.h"
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
@@ -73,7 +72,7 @@ RemoteLinuxRunConfigurationWidget::RemoteLinuxRunConfigurationWidget(RemoteLinux
     : QWidget(parent),
     m_runConfiguration(runConfiguration),
     m_ignoreChange(false),
-    m_deviceEnvReader(new MaemoDeviceEnvReader(this, runConfiguration))
+    m_deviceEnvReader(new RemoteLinuxEnvironmentReader(this, runConfiguration))
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
index 6840a226400..551c0de8ef0 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h
@@ -52,7 +52,7 @@ namespace Utils { class EnvironmentItem; }
 namespace RemoteLinux {
 class RemoteLinuxRunConfiguration;
 
-namespace Internal { class MaemoDeviceEnvReader; }
+namespace Internal { class RemoteLinuxEnvironmentReader; }
 
 class REMOTELINUX_EXPORT RemoteLinuxRunConfigurationWidget : public QWidget
 {
@@ -102,7 +102,7 @@ private:
     bool m_ignoreChange;
     QPushButton *m_fetchEnv;
     QComboBox *m_baseEnvironmentComboBox;
-    Internal::MaemoDeviceEnvReader *m_deviceEnvReader;
+    Internal::RemoteLinuxEnvironmentReader *m_deviceEnvReader;
     ProjectExplorer::EnvironmentWidget *m_environmentWidget;
 };
 
diff --git a/src/plugins/remotelinux/maemosshconfigdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp
similarity index 90%
rename from src/plugins/remotelinux/maemosshconfigdialog.cpp
rename to src/plugins/remotelinux/sshkeycreationdialog.cpp
index 6b21fb6d701..18e7f3186cf 100644
--- a/src/plugins/remotelinux/maemosshconfigdialog.cpp
+++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp
@@ -28,8 +28,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-
-#include "maemosshconfigdialog.h"
+#include "sshkeycreationdialog.h"
 
 #include "linuxdeviceconfiguration.h"
 
@@ -46,7 +45,7 @@
 using namespace Utils;
 using namespace RemoteLinux::Internal;
 
-MaemoSshConfigDialog::MaemoSshConfigDialog(QWidget *parent)
+SshKeyCreationDialog::SshKeyCreationDialog(QWidget *parent)
     : QDialog(parent)
     , home(QDesktopServices::storageLocation(QDesktopServices::HomeLocation))
     , m_keyGenerator(new SshKeyGenerator)
@@ -61,17 +60,17 @@ MaemoSshConfigDialog::MaemoSshConfigDialog(QWidget *parent)
     connect(m_ui.savePrivateKey, SIGNAL(clicked()), this, SLOT(savePrivateKey()));
 }
 
-MaemoSshConfigDialog::~MaemoSshConfigDialog()
+SshKeyCreationDialog::~SshKeyCreationDialog()
 {
 }
 
-void MaemoSshConfigDialog::slotToggled()
+void SshKeyCreationDialog::slotToggled()
 {
     m_ui.comboBox->setCurrentIndex(0);
     m_ui.comboBox->setEnabled(m_ui.rsa->isChecked());
 }
 
-void MaemoSshConfigDialog::generateSshKey()
+void SshKeyCreationDialog::generateSshKey()
 {
     const SshKeyGenerator::KeyType keyType = m_ui.rsa->isChecked()
         ? SshKeyGenerator::Rsa
@@ -91,24 +90,24 @@ void MaemoSshConfigDialog::generateSshKey()
     QApplication::restoreOverrideCursor();
 }
 
-void MaemoSshConfigDialog::savePublicKey()
+void SshKeyCreationDialog::savePublicKey()
 {
     saveKey(true);
 }
 
-void MaemoSshConfigDialog::savePrivateKey()
+void SshKeyCreationDialog::savePrivateKey()
 {
     saveKey(false);
 }
 
-void MaemoSshConfigDialog::checkSshDir()
+void SshKeyCreationDialog::checkSshDir()
 {
     QDir dir(home + QString::fromLatin1("/.ssh"));
     if (!dir.exists())
         dir.mkpath(home + QString::fromLatin1("/.ssh"));
 }
 
-void MaemoSshConfigDialog::saveKey(bool publicKey)
+void SshKeyCreationDialog::saveKey(bool publicKey)
 {
     checkSshDir();
     const QString suggestedTypeSuffix =
diff --git a/src/plugins/remotelinux/maemosshconfigdialog.h b/src/plugins/remotelinux/sshkeycreationdialog.h
similarity index 81%
rename from src/plugins/remotelinux/maemosshconfigdialog.h
rename to src/plugins/remotelinux/sshkeycreationdialog.h
index 5690579741c..b218904b7b1 100644
--- a/src/plugins/remotelinux/maemosshconfigdialog.h
+++ b/src/plugins/remotelinux/sshkeycreationdialog.h
@@ -29,27 +29,27 @@
 **
 **************************************************************************/
 
-#ifndef MAEMOSSHCONFIGDIALOG_H
-#define MAEMOSSHCONFIGDIALOG_H
+#ifndef SSHKEYCREATIONDIALOG_H
+#define SSHKEYCREATIONDIALOG_H
 
-#include "ui_maemosshconfigdialog.h"
+#include "ui_sshkeycreationdialog.h"
 
 #include <QtCore/QScopedPointer>
 #include <QtGui/QDialog>
 
 namespace Utils {
-    class SshKeyGenerator;
+class SshKeyGenerator;
 }
 
 namespace RemoteLinux {
-    namespace Internal {
+namespace Internal {
 
-class MaemoSshConfigDialog : public QDialog
+class SshKeyCreationDialog : public QDialog
 {
     Q_OBJECT
 public:
-    MaemoSshConfigDialog(QWidget *parent = 0);
-    ~MaemoSshConfigDialog();
+    SshKeyCreationDialog(QWidget *parent = 0);
+    ~SshKeyCreationDialog();
 
 signals:
     void privateKeyGenerated(const QString &path);
@@ -67,10 +67,10 @@ private:
 private:
     QString home;
     QScopedPointer<Utils::SshKeyGenerator> m_keyGenerator;
-    Ui::MaemoSshConfigDialog m_ui;
+    Ui::SshKeyCreationDialog m_ui;
 };
 
-    }   // Qt4ProjectManager
-}   // Internal
+} // namespace Internal
+} // namespace RemoteLinux
 
-#endif  // MAEMOSSHCONFIGDIALOG_H
+#endif  // SSHKEYCREATIONDIALOG_H
diff --git a/src/plugins/remotelinux/maemosshconfigdialog.ui b/src/plugins/remotelinux/sshkeycreationdialog.ui
similarity index 98%
rename from src/plugins/remotelinux/maemosshconfigdialog.ui
rename to src/plugins/remotelinux/sshkeycreationdialog.ui
index d3acf095850..58cddd1ad9f 100644
--- a/src/plugins/remotelinux/maemosshconfigdialog.ui
+++ b/src/plugins/remotelinux/sshkeycreationdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MaemoSshConfigDialog</class>
- <widget class="QDialog" name="MaemoSshConfigDialog">
+ <class>SshKeyCreationDialog</class>
+ <widget class="QDialog" name="SshKeyCreationDialog">
   <property name="enabled">
    <bool>true</bool>
   </property>
@@ -254,7 +254,7 @@
   <connection>
    <sender>closeButton</sender>
    <signal>clicked()</signal>
-   <receiver>MaemoSshConfigDialog</receiver>
+   <receiver>SshKeyCreationDialog</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/remotelinux/maemokeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp
similarity index 87%
rename from src/plugins/remotelinux/maemokeydeployer.cpp
rename to src/plugins/remotelinux/sshkeydeployer.cpp
index ac46fbeead0..85dcdc0cd0c 100644
--- a/src/plugins/remotelinux/maemokeydeployer.cpp
+++ b/src/plugins/remotelinux/sshkeydeployer.cpp
@@ -28,8 +28,7 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-
-#include "maemokeydeployer.h"
+#include "sshkeydeployer.h"
 
 #include <utils/ssh/sshremoteprocessrunner.h>
 #include <utils/fileutils.h>
@@ -39,19 +38,17 @@
 using namespace Utils;
 
 namespace RemoteLinux {
-namespace Internal {
 
-MaemoKeyDeployer::MaemoKeyDeployer(QObject *parent)
-    : QObject(parent)
+SshKeyDeployer::SshKeyDeployer(QObject *parent) : QObject(parent)
 {
 }
 
-MaemoKeyDeployer::~MaemoKeyDeployer()
+SshKeyDeployer::~SshKeyDeployer()
 {
     cleanup();
 }
 
-void MaemoKeyDeployer::deployPublicKey(const SshConnectionParameters &sshParams,
+void SshKeyDeployer::deployPublicKey(const SshConnectionParameters &sshParams,
     const QString &keyFilePath)
 {
     cleanup();
@@ -73,7 +70,7 @@ void MaemoKeyDeployer::deployPublicKey(const SshConnectionParameters &sshParams,
     m_deployProcess->run(command);
 }
 
-void MaemoKeyDeployer::handleConnectionFailure()
+void SshKeyDeployer::handleConnectionFailure()
 {
     if (!m_deployProcess)
         return;
@@ -82,7 +79,7 @@ void MaemoKeyDeployer::handleConnectionFailure()
     emit error(tr("Connection failed: %1").arg(errorMsg));
 }
 
-void MaemoKeyDeployer::handleKeyUploadFinished(int exitStatus)
+void SshKeyDeployer::handleKeyUploadFinished(int exitStatus)
 {
     Q_ASSERT(exitStatus == SshRemoteProcess::FailedToStart
         || exitStatus == SshRemoteProcess::KilledBySignal
@@ -100,12 +97,12 @@ void MaemoKeyDeployer::handleKeyUploadFinished(int exitStatus)
         emit error(tr("Key deployment failed: %1.").arg(errorMsg));
 }
 
-void MaemoKeyDeployer::stopDeployment()
+void SshKeyDeployer::stopDeployment()
 {
     cleanup();
 }
 
-void MaemoKeyDeployer::cleanup()
+void SshKeyDeployer::cleanup()
 {
     if (m_deployProcess) {
         disconnect(m_deployProcess.data(), 0, this, 0);
@@ -113,6 +110,4 @@ void MaemoKeyDeployer::cleanup()
     }
 }
 
-
-} // namespace Internal
 } // namespace RemoteLinux
diff --git a/src/plugins/remotelinux/maemokeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h
similarity index 88%
rename from src/plugins/remotelinux/maemokeydeployer.h
rename to src/plugins/remotelinux/sshkeydeployer.h
index be47a975321..fad133fff4e 100644
--- a/src/plugins/remotelinux/maemokeydeployer.h
+++ b/src/plugins/remotelinux/sshkeydeployer.h
@@ -28,9 +28,10 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
+#ifndef SSHKEYDEPLOYER_H
+#define SSHKEYDEPLOYER_H
 
-#ifndef MAEMOKEYDEPLOYER_H
-#define MAEMOKEYDEPLOYER_H
+#include "remotelinux_export.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
@@ -41,14 +42,13 @@ class SshRemoteProcessRunner;
 }
 
 namespace RemoteLinux {
-namespace Internal {
 
-class MaemoKeyDeployer : public QObject
+class REMOTELINUX_EXPORT SshKeyDeployer : public QObject
 {
     Q_OBJECT
 public:
-    explicit MaemoKeyDeployer(QObject *parent = 0);
-    ~MaemoKeyDeployer();
+    explicit SshKeyDeployer(QObject *parent = 0);
+    ~SshKeyDeployer();
 
     void deployPublicKey(const Utils::SshConnectionParameters &sshParams,
         const QString &keyFilePath);
@@ -68,7 +68,6 @@ private:
     QSharedPointer<Utils::SshRemoteProcessRunner> m_deployProcess;
 };
 
-} // namespace Internal
 } // namespace RemoteLinux
 
-#endif // MAEMOKEYDEPLOYER_H
+#endif // SSHKEYDEPLOYER_H
diff --git a/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
similarity index 81%
rename from src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
rename to src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index 9b0e961722b..8d30228af9a 100644
--- a/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -29,14 +29,14 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-#include "maemopertargetdeviceconfigurationlistmodel.h"
+#include "typespecificdeviceconfigurationlistmodel.h"
 
 #include "linuxdeviceconfigurations.h"
 
 namespace RemoteLinux {
 namespace Internal {
 
-MaemoPerTargetDeviceConfigurationListModel::MaemoPerTargetDeviceConfigurationListModel(QObject *parent,
+TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListModel(QObject *parent,
     const QString &osType) : QAbstractListModel(parent), m_targetOsType(osType)
 {
     const LinuxDeviceConfigurations * const devConfs
@@ -45,11 +45,11 @@ MaemoPerTargetDeviceConfigurationListModel::MaemoPerTargetDeviceConfigurationLis
     connect(devConfs, SIGNAL(updated()), this, SIGNAL(updated()));
 }
 
-MaemoPerTargetDeviceConfigurationListModel::~MaemoPerTargetDeviceConfigurationListModel()
+TypeSpecificDeviceConfigurationListModel::~TypeSpecificDeviceConfigurationListModel()
 {
 }
 
-int MaemoPerTargetDeviceConfigurationListModel::rowCount(const QModelIndex &parent) const
+int TypeSpecificDeviceConfigurationListModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid())
         return 0;
@@ -66,7 +66,7 @@ int MaemoPerTargetDeviceConfigurationListModel::rowCount(const QModelIndex &pare
     return count;
 }
 
-QVariant MaemoPerTargetDeviceConfigurationListModel::data(const QModelIndex &index,
+QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index,
     int role) const
 {
     if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole)
@@ -79,7 +79,7 @@ QVariant MaemoPerTargetDeviceConfigurationListModel::data(const QModelIndex &ind
     return displayedName;
 }
 
-LinuxDeviceConfiguration::ConstPtr MaemoPerTargetDeviceConfigurationListModel::deviceAt(int idx) const
+LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::deviceAt(int idx) const
 {
     int currentRow = -1;
     const LinuxDeviceConfigurations * const devConfs
@@ -97,12 +97,12 @@ LinuxDeviceConfiguration::ConstPtr MaemoPerTargetDeviceConfigurationListModel::d
     return LinuxDeviceConfiguration::ConstPtr();
 }
 
-LinuxDeviceConfiguration::ConstPtr MaemoPerTargetDeviceConfigurationListModel::defaultDeviceConfig() const
+LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig() const
 {
     return LinuxDeviceConfigurations::instance()->defaultDeviceConfig(m_targetOsType);
 }
 
-LinuxDeviceConfiguration::ConstPtr MaemoPerTargetDeviceConfigurationListModel::find(LinuxDeviceConfiguration::Id id) const
+LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::find(LinuxDeviceConfiguration::Id id) const
 {
     const LinuxDeviceConfiguration::ConstPtr &devConf
         = LinuxDeviceConfigurations::instance()->find(id);
@@ -111,7 +111,7 @@ LinuxDeviceConfiguration::ConstPtr MaemoPerTargetDeviceConfigurationListModel::f
         ? devConf : defaultDeviceConfig();
 }
 
-int MaemoPerTargetDeviceConfigurationListModel::indexForInternalId(LinuxDeviceConfiguration::Id id) const
+int TypeSpecificDeviceConfigurationListModel::indexForInternalId(LinuxDeviceConfiguration::Id id) const
 {
     const int count = rowCount();
     for (int i = 0; i < count; ++i) {
diff --git a/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
similarity index 84%
rename from src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
rename to src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
index 12cc3342730..4ba72814255 100644
--- a/src/plugins/remotelinux/maemopertargetdeviceconfigurationlistmodel.h
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
@@ -29,8 +29,8 @@
 ** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
-#ifndef MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H
-#define MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H
+#ifndef TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H
+#define TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H
 
 #include "linuxdeviceconfiguration.h"
 
@@ -40,12 +40,12 @@
 namespace RemoteLinux {
 namespace Internal {
 
-class MaemoPerTargetDeviceConfigurationListModel : public QAbstractListModel
+class TypeSpecificDeviceConfigurationListModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    explicit MaemoPerTargetDeviceConfigurationListModel(QObject *parent, const QString &osType);
-    ~MaemoPerTargetDeviceConfigurationListModel();
+    explicit TypeSpecificDeviceConfigurationListModel(QObject *parent, const QString &osType);
+    ~TypeSpecificDeviceConfigurationListModel();
 
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
     virtual QVariant data(const QModelIndex &index,
@@ -66,4 +66,4 @@ private:
 } // namespace Internal
 } // namespace RemoteLinux
 
-#endif // MAEMOPERTARGETDEVICECONFIGURATIONLISTMODEL_H
+#endif // TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H