diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 766de95002b5e3ccc7ed61292ad10787e3ad22b0..7491333504b7707cbc42bf5ef72dbbab5cadd7e2 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -141,7 +141,7 @@ void DeviceManager::load()
 
     // Only create writer now: We do not want to save before the settings were read!
     d->writer = new Utils::PersistentSettingsWriter(
-                settingsFilePath(QLatin1String("/qtcreator/devices.xml")),
+                settingsFilePath(QLatin1String("/devices.xml")),
                 QLatin1String("QtCreatorDevices"));
 
     Utils::PersistentSettingsReader reader;
@@ -151,7 +151,7 @@ void DeviceManager::load()
         sdkDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
     // read devices file from user settings path
     QList<IDevice::Ptr> userDevices;
-    if (reader.load(settingsFilePath(QLatin1String("/qtcreator/devices.xml"))))
+    if (reader.load(settingsFilePath(QLatin1String("/devices.xml"))))
         userDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
     // Insert devices into the model. Prefer the higher device version when there are multiple
     // devices with the same id.
@@ -215,7 +215,7 @@ QVariantMap DeviceManager::toMap() const
 
 Utils::FileName DeviceManager::settingsFilePath(const QString &extension)
 {
-    return Utils::FileName::fromString(QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + extension);
+    return Utils::FileName::fromString(Core::ICore::userResourcePath() + extension);
 }
 
 Utils::FileName DeviceManager::systemSettingsFilePath(const QString &deviceFileRelativePath)
diff --git a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
index 80d76b1eba7065e0aee2e1998cd240dbe3fad349..a24e3657876da008d91d7272bdafcbeab7e38817 100644
--- a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
+++ b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
@@ -187,7 +187,7 @@ void BlackBerryDeviceConnectionManager::disconnectDevice(const ProjectExplorer::
  */
 const QString BlackBerryDeviceConnectionManager::privateKeyPath() const
 {
-    return QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + QLatin1String("/qtcreator/qnx/id_rsa");
+    return Core::ICore::userResourcePath() + QLatin1String("/qnx/id_rsa");
 }
 
 /*!