diff --git a/libnymea-app/devicemanager.cpp b/libnymea-app/devicemanager.cpp
index 9741bd80..10ec3910 100644
--- a/libnymea-app/devicemanager.cpp
+++ b/libnymea-app/devicemanager.cpp
@@ -425,10 +425,10 @@ void DeviceManager::setPluginConfigResponse(int commandId, const QVariantMap &pa
     emit savePluginConfigReply(commandId, params);
 }
 
-void DeviceManager::editDeviceResponse(int commandId, const QVariantMap &params)
+void DeviceManager::editThingResponse(int commandId, const QVariantMap &params)
 {
-    qDebug() << "Edit device response" << params;
-    emit editDeviceReply(commandId, params);
+    qDebug() << "Edit thing response" << params;
+    emit editThingReply(commandId, params);
 }
 
 void DeviceManager::executeActionResponse(int commandId, const QVariantMap &params)
@@ -539,12 +539,12 @@ int DeviceManager::removeThing(const QUuid &thingId, DeviceManager::RemovePolicy
     return m_jsonClient->sendCommand("Devices.RemoveConfiguredDevice", params, this, "removeThingResponse");
 }
 
-int DeviceManager::editDevice(const QUuid &deviceId, const QString &name)
+int DeviceManager::editThing(const QUuid &thingId, const QString &name)
 {
     QVariantMap params;
-    params.insert("deviceId", deviceId.toString());
+    params.insert("deviceId", thingId.toString());
     params.insert("name", name);
-    return m_jsonClient->sendCommand("Devices.EditDevice", params, this, "editDeviceResponse");
+    return m_jsonClient->sendCommand("Devices.EditDevice", params, this, "editThingResponse");
 }
 
 int DeviceManager::setDeviceSettings(const QUuid &deviceId, const QVariantList &settings)
diff --git a/libnymea-app/devicemanager.h b/libnymea-app/devicemanager.h
index 46d6d225..e8959c00 100644
--- a/libnymea-app/devicemanager.h
+++ b/libnymea-app/devicemanager.h
@@ -96,7 +96,7 @@ public:
     Q_INVOKABLE int rePairDevice(const QUuid &deviceId, const QVariantList &deviceParams, const QString &name = QString());
     Q_INVOKABLE int confirmPairing(const QUuid &pairingTransactionId, const QString &secret = QString(), const QString &username = QString());
     Q_INVOKABLE int removeThing(const QUuid &thingId, RemovePolicy policy = RemovePolicyNone);
-    Q_INVOKABLE int editDevice(const QUuid &deviceId, const QString &name);
+    Q_INVOKABLE int editThing(const QUuid &thingId, const QString &name);
     Q_INVOKABLE int setDeviceSettings(const QUuid &deviceId, const QVariantList &settings);
     Q_INVOKABLE int reconfigureDevice(const QUuid &deviceId, const QVariantList &deviceParams);
     Q_INVOKABLE int reconfigureDiscoveredDevice(const QUuid &deviceId, const QUuid &deviceDescriptorId, const QVariantList &paramOverride);
@@ -122,7 +122,7 @@ private:
     Q_INVOKABLE void pairDeviceResponse(int commandId, const QVariantMap &params);
     Q_INVOKABLE void confirmPairingResponse(int commandId, const QVariantMap &params);
     Q_INVOKABLE void setPluginConfigResponse(int commandId, const QVariantMap &params);
-    Q_INVOKABLE void editDeviceResponse(int commandId, const QVariantMap &params);
+    Q_INVOKABLE void editThingResponse(int commandId, const QVariantMap &params);
     Q_INVOKABLE void executeActionResponse(int commandId, const QVariantMap &params);
     Q_INVOKABLE void reconfigureDeviceResponse(int commandId, const QVariantMap &params);
     Q_INVOKABLE void browseDeviceResponse(int commandId, const QVariantMap &params);
@@ -144,7 +144,7 @@ signals:
     void addDeviceReply(int commandId, const QVariantMap &params);
     void removeThingReply(int commandId, const QVariantMap &params);
     void savePluginConfigReply(int commandId, const QVariantMap &params);
-    void editDeviceReply(int commandId, const QVariantMap &params);
+    void editThingReply(int commandId, const QVariantMap &params);
     void reconfigureDeviceReply(int commandId, const QVariantMap &params);
     void executeActionReply(int commandId, const QVariantMap &params);
     void executeBrowserItemReply(int commandId, const QVariantMap &params);
diff --git a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
index d58cc53e..b6e675b4 100644
--- a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
+++ b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml
@@ -306,7 +306,7 @@ SettingsPageBase {
             }
 
             onAccepted: {
-                engine.deviceManager.editDevice(root.device.id, textField.text)
+                engine.deviceManager.editThing(root.device.id, textField.text)
                 dialog.destroy();
             }
         }