diff --git a/src/newaccountmodel.cpp b/src/newaccountmodel.cpp
index 512dffd5cf4b560fdee8110643430fdb29f1a22b..66b759de3d8c34d8019592b70efdb59f715d76f6 100644
--- a/src/newaccountmodel.cpp
+++ b/src/newaccountmodel.cpp
@@ -812,8 +812,8 @@ account::Info::fromDetails(const MapStringString& details)
     confProperties.password = details[ConfProperties::PASSWORD];
     confProperties.realm = details[ConfProperties::REALM];
     confProperties.localInterface = details[ConfProperties::LOCAL_INTERFACE];
-    confProperties.deviceId = details[ConfProperties::RING_DEVICE_ID];
-    confProperties.deviceName = details[ConfProperties::RING_DEVICE_NAME];
+    confProperties.deviceId = details[ConfProperties::DEVICE_ID];
+    confProperties.deviceName = details[ConfProperties::DEVICE_NAME];
     confProperties.publishedSameAsLocal = toBool(details[ConfProperties::PUBLISHED_SAMEAS_LOCAL]);
     confProperties.localPort = toInt(details[ConfProperties::LOCAL_PORT]);
     confProperties.publishedPort = toInt(details[ConfProperties::PUBLISHED_PORT]);
@@ -928,8 +928,8 @@ account::ConfProperties_t::toDetails() const
     details[ConfProperties::ROUTE] = this->routeset;
     details[ConfProperties::PASSWORD] = this->password;
     details[ConfProperties::REALM] = this->realm;
-    details[ConfProperties::RING_DEVICE_ID] = this->deviceId;
-    details[ConfProperties::RING_DEVICE_NAME] = this->deviceName;
+    details[ConfProperties::DEVICE_ID] = this->deviceId;
+    details[ConfProperties::DEVICE_NAME] = this->deviceName;
     details[ConfProperties::LOCAL_INTERFACE] = this->localInterface;
     details[ConfProperties::PUBLISHED_SAMEAS_LOCAL] = toQString(this->publishedSameAsLocal);
     details[ConfProperties::LOCAL_PORT] = toQString(this->localPort);
diff --git a/src/newdevicemodel.cpp b/src/newdevicemodel.cpp
index 34fbc8b3d3d0ce06b00787fd55758b57fbcc1a77..a4b5816d192588b0f8eec81414607da6f047484a 100644
--- a/src/newdevicemodel.cpp
+++ b/src/newdevicemodel.cpp
@@ -121,7 +121,7 @@ NewDeviceModelPimpl::NewDeviceModelPimpl(const NewDeviceModel& linked,
 {
     const MapStringString aDetails = ConfigurationManager::instance().getAccountDetails(
         linked.owner.id);
-    currentDeviceId_ = aDetails.value(DRing::Account::ConfProperties::RING_DEVICE_ID);
+    currentDeviceId_ = aDetails.value(DRing::Account::ConfProperties::DEVICE_ID);
     const MapStringString accountDevices = ConfigurationManager::instance().getKnownRingDevices(
         linked.owner.id);
     auto it = accountDevices.begin();