diff --git a/libnymea-core/jsonrpc/scriptshandler.cpp b/libnymea-core/jsonrpc/scriptshandler.cpp
index 5e42abb7..0eaec48d 100644
--- a/libnymea-core/jsonrpc/scriptshandler.cpp
+++ b/libnymea-core/jsonrpc/scriptshandler.cpp
@@ -43,7 +43,7 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent):
     description = "Edit a script";
     params.insert("id", enumValueName(Uuid));
     params.insert("o:name", enumValueName(String));
-    params.insert("content", enumValueName(String));
+    params.insert("o:content", enumValueName(String));
     returns.insert("scriptError", enumRef<ScriptEngine::ScriptError>());
     returns.insert("o:errors", enumValueName(StringList));
     registerMethod("EditScript", description, params, returns);
@@ -65,10 +65,16 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent):
     registerNotification("ScriptRemoved", description, params);
 
     params.clear();
-    description = "Emitted when a script has been changed in the system.";
-    params.insert("script", objectRef<Script>());
+    description = "Emitted when a script has been changed in the system (e.g. renamed).";
+    params.insert("scriptId", enumValueName(Uuid));
+    params.insert("name", enumValueName(String));
     registerNotification("ScriptChanged", description, params);
 
+    params.clear();
+    description = "Emitted when a script's content has been changed in the system.";
+    params.insert("scriptId", enumValueName(Uuid));
+    registerNotification("ScriptContentChanged", description, params);
+
     params.clear();
     description = "Emitted when a script produces a console message.";
     params.insert("scriptId", enumValueName(Uuid));
@@ -86,10 +92,16 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent):
         params.insert("id", scriptId);
         emit ScriptAdded(params);
     });
+    connect(m_engine, &ScriptEngine::scriptRenamed, this, [this](const Script &script){
+        QVariantMap params;
+        params.insert("scriptId", script.id());
+        params.insert("name", script.name());
+        emit ScriptChanged(params);
+    });
     connect(m_engine, &ScriptEngine::scriptChanged, this, [this](const Script &script){
         QVariantMap params;
-        params.insert("script", pack(script));
-        emit ScriptChanged(params);
+        params.insert("scriptId", script.id());
+        emit ScriptContentChanged(params);
     });
     connect(m_engine, &ScriptEngine::scriptConsoleMessage, this, [this](const QUuid &scriptId, ScriptEngine::ScriptMessageType type, const QString &message){
         QVariantMap params;
@@ -145,15 +157,27 @@ JsonReply* ScriptsHandler::AddScript(const QVariantMap &params)
 JsonReply *ScriptsHandler::EditScript(const QVariantMap &params)
 {
     QUuid scriptId = params.value("id").toUuid();
-    QByteArray content = params.value("content").toByteArray();
-
     QVariantMap returns;
 
-    ScriptEngine::EditScriptReply reply = m_engine->editScript(scriptId, content);
-    returns.insert("scriptError", enumValueName(reply.scriptError));
-    if (reply.scriptError != ScriptEngine::ScriptErrorNoError) {
-        returns.insert("errors", reply.errors);
+    if (params.contains("name")) {
+        QString name = params.value("name").toString();
+        ScriptEngine::ScriptError result = m_engine->renameScript(scriptId, name);
+        if (result != ScriptEngine::ScriptErrorNoError) {
+            returns.insert("scriptError", enumValueName(result));
+            return createReply(returns);
+        }
     }
+    if (params.contains("content")) {
+        QByteArray content = params.value("content").toByteArray();
+        ScriptEngine::EditScriptReply reply = m_engine->editScript(scriptId, content);
+        if (reply.scriptError != ScriptEngine::ScriptErrorNoError) {
+            returns.insert("scriptError", enumValueName(reply.scriptError));
+            returns.insert("errors", reply.errors);
+            return createReply(returns);
+        }
+    }
+
+    returns.insert("scriptError", enumValueName(ScriptEngine::ScriptErrorNoError));
     return createReply(returns);
 }
 
diff --git a/libnymea-core/jsonrpc/scriptshandler.h b/libnymea-core/jsonrpc/scriptshandler.h
index f69975d0..15553abf 100644
--- a/libnymea-core/jsonrpc/scriptshandler.h
+++ b/libnymea-core/jsonrpc/scriptshandler.h
@@ -27,6 +27,7 @@ signals:
     void ScriptAdded(const QVariantMap &params);
     void ScriptRemoved(const QVariantMap &params);
     void ScriptChanged(const QVariantMap &params);
+    void ScriptContentChanged(const QVariantMap &params);
     void ScriptLogMessage(const QVariantMap &params);
 
 private:
diff --git a/libnymea-core/scriptengine/scriptengine.cpp b/libnymea-core/scriptengine/scriptengine.cpp
index 6529d3d2..9bd18866 100644
--- a/libnymea-core/scriptengine/scriptengine.cpp
+++ b/libnymea-core/scriptengine/scriptengine.cpp
@@ -139,10 +139,41 @@ ScriptEngine::AddScriptReply ScriptEngine::addScript(const QString &name, const
     return reply;
 }
 
+ScriptEngine::ScriptError ScriptEngine::renameScript(const QUuid &id, const QString &name)
+{
+    if (!m_scripts.contains(id)) {
+        qCWarning(dcScriptEngine()) << "No script with id" << id;
+        return ScriptErrorScriptNotFound;
+    }
+
+    QString jsonFileName = baseName(id) + ".json";
+    QFile jsonFile(jsonFileName);
+    if (!jsonFile.open(QFile::ReadWrite)) {
+        qCWarning(dcJsonRpc()) << "Erorr opening script json file" << jsonFileName;
+        return ScriptErrorHardwareFailure;
+    }
+    QJsonParseError error;
+    QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonFile.readAll(), &error);
+    QVariantMap jsonData = jsonDocument.toVariant().toMap();
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(dcScriptEngine()) << "Error parsing json file. Recreating it...";
+        // This is non-critical as we could open it. We can recreate it now.
+    }
+    jsonData["name"] = name;
+    QByteArray jsonString = QJsonDocument::fromVariant(jsonData).toJson();
+    if (!jsonFile.resize(0) || jsonFile.write(jsonString) != jsonString.length()) {
+        qCWarning(dcScriptEngine()) << "Error writing json metadata" << jsonFileName;
+        return ScriptErrorHardwareFailure;
+    }
+    jsonFile.close();
+    m_scripts[id]->setName(name);
+    qCDebug(dcScriptEngine()) << "Script" << id << "renamed to" << name;
+    emit scriptRenamed(*m_scripts.value(id));
+    return ScriptErrorNoError;
+}
+
 ScriptEngine::EditScriptReply ScriptEngine::editScript(const QUuid &id, const QByteArray &content)
 {
-    QString scriptFileName = baseName(id) + ".qml";
-    QFile scriptFile(scriptFileName);
     EditScriptReply reply;
 
     if (!m_scripts.contains(id)) {
@@ -154,11 +185,12 @@ ScriptEngine::EditScriptReply ScriptEngine::editScript(const QUuid &id, const QB
     Script *script = m_scripts.value(id);
     unloadScript(script);
 
-
     // Deleted compiled qml file to make sure we're reloading the new one
     QString compiledScriptFileName = baseName(id) + ".qmlc";
     QFile::remove(compiledScriptFileName);
 
+    QString scriptFileName = baseName(id) + ".qml";
+    QFile scriptFile(scriptFileName);
     if (!scriptFile.open(QFile::ReadWrite)) {
         qCWarning(dcScriptEngine()) << "Error opening script" << id;
         reply.scriptError = ScriptErrorHardwareFailure;
@@ -180,6 +212,7 @@ ScriptEngine::EditScriptReply ScriptEngine::editScript(const QUuid &id, const QB
 
     bool loaded = loadScript(script);
     if (!loaded) {
+        qCDebug(dcScriptEngine()) << "Restoring old content";
         reply.scriptError = ScriptErrorInvalidScript;
         reply.errors = script->errors;
 
@@ -193,10 +226,9 @@ ScriptEngine::EditScriptReply ScriptEngine::editScript(const QUuid &id, const QB
         return reply;
     }
 
+    qCDebug(dcScriptEngine()) << "Script updated" << script->name();
     reply.scriptError = ScriptErrorNoError;
-
     emit scriptChanged(*script);
-
     return reply;
 }
 
diff --git a/libnymea-core/scriptengine/scriptengine.h b/libnymea-core/scriptengine/scriptengine.h
index 1e8afe6c..149d833f 100644
--- a/libnymea-core/scriptengine/scriptengine.h
+++ b/libnymea-core/scriptengine/scriptengine.h
@@ -48,6 +48,7 @@ public:
     Scripts scripts();
     GetScriptReply scriptContent(const QUuid &id);
     AddScriptReply addScript(const QString &name, const QByteArray &content);
+    ScriptError renameScript(const QUuid &id, const QString &name);
     EditScriptReply editScript(const QUuid &id, const QByteArray &content);
     ScriptError removeScript(const QUuid &id);
 
@@ -55,6 +56,7 @@ signals:
     void scriptAdded(const Script &script);
     void scriptRemoved(const QUuid &id);
     void scriptChanged(const Script &script);
+    void scriptRenamed(const Script &script);
 
     void scriptConsoleMessage(const QUuid &scriptId, ScriptMessageType type, const QString &message);