diff --git a/AutoSave/AutoSaveSettings.cpp b/AutoSave/AutoSaveSettings.cpp
index 15eba86aea..1c82b6148e 100644
--- a/AutoSave/AutoSaveSettings.cpp
+++ b/AutoSave/AutoSaveSettings.cpp
@@ -15,7 +15,7 @@ void AutoSaveSettings::FromJSON(const JSONItem& json)
 
 JSONItem AutoSaveSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_flags", m_flags);
     json.addProperty("m_checkInterval", m_checkInterval);
     return json;
diff --git a/CodeFormatter/SourceFormatterBase.cpp b/CodeFormatter/SourceFormatterBase.cpp
index 1631dc731f..6fcaf9013c 100644
--- a/CodeFormatter/SourceFormatterBase.cpp
+++ b/CodeFormatter/SourceFormatterBase.cpp
@@ -17,7 +17,7 @@ void SourceFormatterBase::FromJSON(const JSONItem& json)
 
 JSONItem SourceFormatterBase::ToJSON() const
 {
-    JSONItem ele = JSONItem::createObject(GetName());
+    JSONItem ele = JSONItem::createObject();
     ele.addProperty("languages", m_languages);
     ele.addProperty("flags", m_flags);
     ele.addProperty("config_file", m_configFile);
diff --git a/CodeLite/JSON.cpp b/CodeLite/JSON.cpp
index 9b10baa4e1..45668f2e9b 100644
--- a/CodeLite/JSON.cpp
+++ b/CodeLite/JSON.cpp
@@ -128,10 +128,6 @@ cJSON* JSON::release()
 JSONItem::JSONItem(cJSON* json)
     : m_json(json)
 {
-    if (m_json) {
-        m_propertyName = m_json->string ? m_json->string : "";
-        m_type = m_json->type;
-    }
 }
 
 JSONItem JSONItem::operator[](int index) const
@@ -244,42 +240,6 @@ bool JSONItem::isString() const
     return m_json->type == cJSON_String;
 }
 
-void JSONItem::append(const JSONItem& element)
-{
-    if (!m_json) {
-        return;
-    }
-
-    switch (element.getType()) {
-    case cJSON_False:
-        cJSON_AddFalseToObject(m_json, element.GetPropertyName().mb_str(wxConvUTF8).data());
-        break;
-
-    case cJSON_True:
-        cJSON_AddTrueToObject(m_json, element.GetPropertyName().mb_str(wxConvUTF8).data());
-        break;
-
-    case cJSON_NULL:
-        cJSON_AddNullToObject(m_json, element.GetPropertyName().mb_str(wxConvUTF8).data());
-        break;
-
-    case cJSON_Number:
-        cJSON_AddNumberToObject(m_json, element.GetPropertyName().mb_str(wxConvUTF8).data(), element.m_valueNumer);
-        break;
-
-    case cJSON_String:
-        cJSON_AddStringToObject(m_json,
-                                element.GetPropertyName().mb_str(wxConvUTF8).data(),
-                                element.m_valueString.mb_str(wxConvUTF8).data());
-        break;
-
-    case cJSON_Array:
-    case cJSON_Object:
-        cJSON_AddItemToObject(m_json, element.GetPropertyName().mb_str(wxConvUTF8).data(), element.m_json);
-        break;
-    }
-}
-
 void JSONItem::arrayAppend(const char* value)
 {
     if (!m_json) {
@@ -304,55 +264,25 @@ void JSONItem::arrayAppend(int number) { arrayAppend((double)number); }
 
 void JSONItem::arrayAppend(const wxString& value) { arrayAppend((const char*)value.mb_str(wxConvUTF8).data()); }
 
-void JSONItem::arrayAppend(const JSONItem& element)
+void JSONItem::arrayAppend(JSONItem&& element)
 {
     if (!m_json) {
         return;
     }
-
-    cJSON* p = NULL;
-    switch (element.getType()) {
-    case cJSON_False:
-        p = cJSON_CreateFalse();
-        break;
-
-    case cJSON_True:
-        p = cJSON_CreateTrue();
-        break;
-
-    case cJSON_NULL:
-        p = cJSON_CreateNull();
-        break;
-
-    case cJSON_Number:
-        p = cJSON_CreateNumber(element.m_valueNumer);
-        break;
-
-    case cJSON_String:
-        p = cJSON_CreateString(element.m_valueString.mb_str(wxConvUTF8).data());
-        break;
-    case cJSON_Array:
-    case cJSON_Object:
-        p = element.m_json;
-        break;
-    }
-    if (p) {
-        cJSON_AddItemToArray(m_json, p);
+    if (element.m_json) {
+        cJSON_AddItemToArray(m_json, element.m_json);
     }
 }
 
 JSONItem JSONItem::createArray()
 {
     JSONItem arr(cJSON_CreateArray());
-    arr.setType(cJSON_Array);
     return arr;
 }
 
-JSONItem JSONItem::createObject(const wxString& name)
+JSONItem JSONItem::createObject()
 {
     JSONItem obj(cJSON_CreateObject());
-    obj.SetPropertyName(name);
-    obj.setType(cJSON_Object);
     return obj;
 }
 
@@ -598,7 +528,7 @@ JSONItem& JSONItem::addProperty(const wxString& name, const wxStringMap_t& strin
         JSONItem obj = JSONItem::createObject();
         obj.addProperty("key", key);
         obj.addProperty("value", value);
-        arr.arrayAppend(obj);
+        arr.arrayAppend(std::move(obj));
     }
     addProperty(name, arr);
     return *this;
@@ -691,8 +621,8 @@ JSONItem JSONItem::AddArray(const wxString& name)
 
 JSONItem JSONItem::AddObject(const wxString& name)
 {
-    JSONItem json = createObject(name);
-    append(json);
+    JSONItem json = createObject();
+    addProperty(name, json);
     return json;
 }
 
@@ -757,11 +687,7 @@ std::vector<int> JSONItem::toIntArray(const std::vector<int>& defaultValue) cons
 
 JSONItem& JSONItem::addProperty(const wxString& name, const std::vector<int>& arr_int)
 {
-    if (!m_json) {
-        return *this;
-    }
-
-    if (m_type != cJSON_Object) {
+    if (!m_json || !isObject()) {
         return *this;
     }
 
diff --git a/CodeLite/JSON.h b/CodeLite/JSON.h
index 2cf6cf1164..7b6c2b2192 100644
--- a/CodeLite/JSON.h
+++ b/CodeLite/JSON.h
@@ -54,6 +54,7 @@ class JSON;
 class WXDLLIMPEXP_CL JSONItem
 {
     friend JSON;
+
 public:
     explicit JSONItem(cJSON* json);
     JSONItem() = default;
@@ -144,10 +145,10 @@ class WXDLLIMPEXP_CL JSONItem
     // Writers
     ////////////////////////////////////////////////
     /**
-     * @brief create new named object and append it to this json element
+     * @brief create new object
      * @return the newly created object
      */
-    static JSONItem createObject(const wxString& name = wxT(""));
+    static JSONItem createObject();
     /**
      * @brief create new array
      * @return the newly created array
@@ -164,11 +165,6 @@ class WXDLLIMPEXP_CL JSONItem
      */
     JSONItem AddObject(const wxString& name);
 
-    /**
-     * @brief append new element to this json element
-     */
-    void append(const JSONItem& element);
-
     JSONItem& addProperty(const wxString& name, const wxString& value);
     JSONItem& addProperty(const wxString& name, const std::string& value);
     JSONItem& addProperty(const wxString& name, const wxChar* value);
@@ -209,7 +205,7 @@ class WXDLLIMPEXP_CL JSONItem
      * @brief append new number
      * @return the newly added property
      */
-    void arrayAppend(const JSONItem& element);
+    void arrayAppend(JSONItem&& element);
     void arrayAppend(const wxString& value);
     void arrayAppend(const char* value);
     void arrayAppend(const std::string& value);
@@ -219,12 +215,6 @@ class WXDLLIMPEXP_CL JSONItem
     bool isOk() const { return m_json != NULL; }
 
 private:
-
-    const wxString& GetPropertyName() const { return m_propertyName; }
-    void SetPropertyName(const wxString& name) { m_propertyName = name; }
-    int getType() const { return m_type; }
-    void setType(int m_type) { this->m_type = m_type; }
-
     /**
      * @brief release the internal pointer
      */
@@ -234,20 +224,14 @@ class WXDLLIMPEXP_CL JSONItem
         m_json = nullptr;
         return temp;
     }
+
 private:
     cJSON* m_json = nullptr;
-    wxString m_propertyName;
-    int m_type = wxNOT_FOUND;
-
-    // Values
-    wxString m_valueString;
-    double m_valueNumer = 0;
 };
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
-enum class JsonType
-{
+enum class JsonType {
     Array,
     Null,
     Object,
diff --git a/CodeLite/LSP/CodeActionRequest.cpp b/CodeLite/LSP/CodeActionRequest.cpp
index 33f16d741c..20e304f7d4 100644
--- a/CodeLite/LSP/CodeActionRequest.cpp
+++ b/CodeLite/LSP/CodeActionRequest.cpp
@@ -11,7 +11,7 @@ LSP::CodeActionRequest::CodeActionRequest(const LSP::TextDocumentIdentifier& tex
     m_params->As<CodeActionParams>()->SetTextDocument(textDocument);
     m_params->As<CodeActionParams>()->SetRange(range);
     m_params->As<CodeActionParams>()->SetDiagnostics(diags);
-    LSP_DEBUG() << ToJSON(wxEmptyString).format(true) << endl;
+    LSP_DEBUG() << ToJSON().format(true) << endl;
 }
 
 void LSP::CodeActionRequest::OnResponse(const LSP::ResponseMessage& response, wxEvtHandler* owner)
diff --git a/CodeLite/LSP/CompletionItem.cpp b/CodeLite/LSP/CompletionItem.cpp
index 847e9f766e..1db0747dad 100644
--- a/CodeLite/LSP/CompletionItem.cpp
+++ b/CodeLite/LSP/CompletionItem.cpp
@@ -1,6 +1,6 @@
 #include "CompletionItem.h"
 
-JSONItem LSP::CompletionItem::ToJSON(const wxString& name) const { return JSONItem(NULL); }
+JSONItem LSP::CompletionItem::ToJSON() const { return JSONItem(NULL); }
 
 void LSP::CompletionItem::FromJSON(const JSONItem& json)
 {
diff --git a/CodeLite/LSP/CompletionItem.h b/CodeLite/LSP/CompletionItem.h
index 49d03bcf31..26e4828636 100644
--- a/CodeLite/LSP/CompletionItem.h
+++ b/CodeLite/LSP/CompletionItem.h
@@ -64,9 +64,9 @@ class WXDLLIMPEXP_CL CompletionItem : public Serializable
 
 public:
     CompletionItem() = default;
-    virtual ~CompletionItem() = default;
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
+    ~CompletionItem() override = default;
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
     void SetDetail(const wxString& detail) { this->m_detail = detail; }
     void SetDocumentation(const MarkupContent& documentation) { this->m_documentation = documentation; }
     void SetFilterText(const wxString& filterText) { this->m_filterText = filterText; }
diff --git a/CodeLite/LSP/InitializeRequest.cpp b/CodeLite/LSP/InitializeRequest.cpp
index 2257cda105..6d222464d1 100644
--- a/CodeLite/LSP/InitializeRequest.cpp
+++ b/CodeLite/LSP/InitializeRequest.cpp
@@ -8,9 +8,9 @@ LSP::InitializeRequest::InitializeRequest(bool withTokenTypes, const wxString& r
     m_rootUri = rootUri;
 }
 
-JSONItem LSP::InitializeRequest::ToJSON(const wxString& name) const
+JSONItem LSP::InitializeRequest::ToJSON() const
 {
-    JSONItem json = Request::ToJSON(name);
+    JSONItem json = Request::ToJSON();
 
     // add the 'params'
     JSONItem params = JSONItem::createObject();
diff --git a/CodeLite/LSP/InitializeRequest.h b/CodeLite/LSP/InitializeRequest.h
index 67a158bd18..3d82a9ef1f 100644
--- a/CodeLite/LSP/InitializeRequest.h
+++ b/CodeLite/LSP/InitializeRequest.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CL InitializeRequest : public LSP::Request
     }
     int GetProcessId() const { return m_processId; }
     const wxString& GetRootUri() const { return m_rootUri; }
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
     void OnResponse(const LSP::ResponseMessage& response, wxEvtHandler* owner) override;
     bool IsPositionDependentRequest() const override { return false; }
     void SetInitOptions(const wxString& initOptions) { this->m_initOptions = initOptions; }
diff --git a/CodeLite/LSP/InitializedNotification.cpp b/CodeLite/LSP/InitializedNotification.cpp
index a5bc777a47..fa42e3065a 100644
--- a/CodeLite/LSP/InitializedNotification.cpp
+++ b/CodeLite/LSP/InitializedNotification.cpp
@@ -3,10 +3,9 @@
 namespace LSP
 {
 struct InitializedParams : public Params {
-    JSONItem ToJSON(const wxString& name) const override
+    JSONItem ToJSON() const override
     {
-        wxUnusedVar(name);
-        return JSONItem::createObject(name);
+        return JSONItem::createObject();
     }
 
     void FromJSON(const JSONItem& json) override { wxUnusedVar(json); };
diff --git a/CodeLite/LSP/JSONObject.h b/CodeLite/LSP/JSONObject.h
index 220ef3f8ad..fc5fff483d 100644
--- a/CodeLite/LSP/JSONObject.h
+++ b/CodeLite/LSP/JSONObject.h
@@ -14,7 +14,7 @@ class WXDLLIMPEXP_CL Serializable
 public:
     Serializable() = default;
     virtual ~Serializable() = default;
-    virtual JSONItem ToJSON(const wxString& name) const = 0;
+    virtual JSONItem ToJSON() const = 0;
     virtual void FromJSON(const JSONItem& json) = 0;
 
     bool operator==(const Serializable&) const = default;
diff --git a/CodeLite/LSP/Message.cpp b/CodeLite/LSP/Message.cpp
index a8a21062e5..6535aee955 100644
--- a/CodeLite/LSP/Message.cpp
+++ b/CodeLite/LSP/Message.cpp
@@ -38,9 +38,9 @@ int ReadHeaders(const std::string& message, std::unordered_map<std::string, std:
 
 } // namespace
 
-JSONItem LSP::Message::ToJSON(const wxString& name) const
+JSONItem LSP::Message::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("jsonrpc", m_jsonrpc);
     return json;
 }
diff --git a/CodeLite/LSP/Message.h b/CodeLite/LSP/Message.h
index c953fb51c2..9a80350149 100644
--- a/CodeLite/LSP/Message.h
+++ b/CodeLite/LSP/Message.h
@@ -19,9 +19,9 @@ class WXDLLIMPEXP_CL Message : public LSP::Serializable
 
 public:
     Message() = default;
-    virtual ~Message() = default;
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
+    ~Message() override = default;
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
 
     /**
      * @brief serialize this message into string
diff --git a/CodeLite/LSP/MessageWithParams.cpp b/CodeLite/LSP/MessageWithParams.cpp
index 1702593192..c345a828df 100644
--- a/CodeLite/LSP/MessageWithParams.cpp
+++ b/CodeLite/LSP/MessageWithParams.cpp
@@ -5,12 +5,12 @@
 #include <sstream>
 #include <wx/string.h>
 
-JSONItem LSP::MessageWithParams::ToJSON(const wxString& name) const
+JSONItem LSP::MessageWithParams::ToJSON() const
 {
-    JSONItem json = Message::ToJSON(name);
+    JSONItem json = Message::ToJSON();
     json.addProperty("method", GetMethod());
     if (m_params) {
-        json.addProperty("params", m_params->ToJSON("params"));
+        json.addProperty("params", m_params->ToJSON());
     }
     return json;
 }
@@ -24,7 +24,7 @@ void LSP::MessageWithParams::FromJSON(const JSONItem& json)
 std::string LSP::MessageWithParams::ToString() const
 {
     // Serialize the object and construct a JSON-RPC message
-    JSONItem json = ToJSON("");
+    JSONItem json = ToJSON();
     char* data = json.FormatRawString(false);
 
     std::string s;
diff --git a/CodeLite/LSP/MessageWithParams.h b/CodeLite/LSP/MessageWithParams.h
index 7c29b1b422..665c174476 100644
--- a/CodeLite/LSP/MessageWithParams.h
+++ b/CodeLite/LSP/MessageWithParams.h
@@ -24,10 +24,10 @@ class WXDLLIMPEXP_CL MessageWithParams : public LSP::Message
 
 public:
     MessageWithParams() = default;
-    virtual ~MessageWithParams() = default;
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
-    virtual std::string ToString() const;
+    ~MessageWithParams() override = default;
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
+    std::string ToString() const override;
 
     void SetMethod(const wxString& method) { this->m_method = method; }
     const wxString& GetMethod() const { return m_method; }
diff --git a/CodeLite/LSP/RenameRequest.cpp b/CodeLite/LSP/RenameRequest.cpp
index 5b50c3066b..4e3eb547c9 100644
--- a/CodeLite/LSP/RenameRequest.cpp
+++ b/CodeLite/LSP/RenameRequest.cpp
@@ -35,7 +35,7 @@ void LSP::RenameRequest::OnResponse(const LSP::ResponseMessage& response, wxEvtH
         for(const auto& [filepath, changes] : modifications) {
             LSP_DEBUG() << "  " << filepath << modifications.size() << "changes:" << endl;
             for(const auto& change : changes) {
-                LSP_DEBUG() << "    " << change.ToJSON(wxEmptyString).format(false) << endl;
+                LSP_DEBUG() << "    " << change.ToJSON().format(false) << endl;
             }
         }
     }
diff --git a/CodeLite/LSP/Request.cpp b/CodeLite/LSP/Request.cpp
index c252a7294d..09e2918031 100644
--- a/CodeLite/LSP/Request.cpp
+++ b/CodeLite/LSP/Request.cpp
@@ -5,9 +5,9 @@ LSP::Request::Request()
 {
 }
 
-JSONItem LSP::Request::ToJSON(const wxString& name) const
+JSONItem LSP::Request::ToJSON() const
 {
-    JSONItem json = MessageWithParams::ToJSON(name);
+    JSONItem json = MessageWithParams::ToJSON();
     json.addProperty("id", GetId());
     return json;
 }
diff --git a/CodeLite/LSP/Request.h b/CodeLite/LSP/Request.h
index 8556fc9f2e..5176bd5f26 100644
--- a/CodeLite/LSP/Request.h
+++ b/CodeLite/LSP/Request.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_CL Request : public LSP::MessageWithParams
     void SetId(int id) { this->m_id = id; }
     int GetId() const { return m_id; }
 
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
     void FromJSON(const JSONItem& json) override;
 
     /**
diff --git a/CodeLite/LSP/ResponseError.cpp b/CodeLite/LSP/ResponseError.cpp
index 081c052ce0..f55ceff180 100644
--- a/CodeLite/LSP/ResponseError.cpp
+++ b/CodeLite/LSP/ResponseError.cpp
@@ -22,4 +22,4 @@ void LSP::ResponseError::FromJSON(const JSONItem& json)
 
 std::string LSP::ResponseError::ToString() const { return ""; }
 
-JSONItem LSP::ResponseError::ToJSON(const wxString& name) const { return JSONItem(nullptr); }
+JSONItem LSP::ResponseError::ToJSON() const { return JSONItem(nullptr); }
diff --git a/CodeLite/LSP/ResponseError.h b/CodeLite/LSP/ResponseError.h
index cf8ca367a4..bf88736d57 100644
--- a/CodeLite/LSP/ResponseError.h
+++ b/CodeLite/LSP/ResponseError.h
@@ -30,10 +30,10 @@ class WXDLLIMPEXP_CL ResponseError : public Message
 public:
     ResponseError(const wxString& message);
     ResponseError() = default;
-    virtual ~ResponseError() = default;
-    void FromJSON(const JSONItem& json);
-    JSONItem ToJSON(const wxString& name) const;
-    virtual std::string ToString() const;
+    ~ResponseError() override = default;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
+    std::string ToString() const override;
     void SetErrorCode(int errorCode) { this->m_errorCode = errorCode; }
     void SetMessage(const wxString& message) { this->m_message = message; }
     int GetErrorCode() const { return m_errorCode; }
diff --git a/CodeLite/LSP/ResponseMessage.cpp b/CodeLite/LSP/ResponseMessage.cpp
index 4c83a2b16d..33347d9c8e 100644
--- a/CodeLite/LSP/ResponseMessage.cpp
+++ b/CodeLite/LSP/ResponseMessage.cpp
@@ -18,7 +18,7 @@ std::string LSP::ResponseMessage::ToString() const
 }
 
 // we don't really serialise response messages
-JSONItem LSP::ResponseMessage::ToJSON(const wxString& name) const { return JSONItem(nullptr); }
+JSONItem LSP::ResponseMessage::ToJSON() const { return JSONItem(nullptr); }
 
 void LSP::ResponseMessage::FromJSON(const JSONItem& json)
 {
diff --git a/CodeLite/LSP/ResponseMessage.h b/CodeLite/LSP/ResponseMessage.h
index 515af13146..432abc6d5c 100644
--- a/CodeLite/LSP/ResponseMessage.h
+++ b/CodeLite/LSP/ResponseMessage.h
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_CL ResponseMessage : public LSP::Message
 public:
     ResponseMessage(std::unique_ptr<JSON>&& json);
     ~ResponseMessage() override = default;
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
     void FromJSON(const JSONItem& json) override;
 
     std::string ToString() const override;
diff --git a/CodeLite/LSP/WorkspaceExecuteCommand.cpp b/CodeLite/LSP/WorkspaceExecuteCommand.cpp
index 333d98c96b..9576522fc2 100644
--- a/CodeLite/LSP/WorkspaceExecuteCommand.cpp
+++ b/CodeLite/LSP/WorkspaceExecuteCommand.cpp
@@ -7,7 +7,7 @@ WorkspaceExecuteCommand::WorkspaceExecuteCommand(const wxString& filepath, const
 {
     SetMethod("workspace/executeCommand");
     m_params.reset(new ExecuteCommandParams(command.GetCommand(), command.GetArguments()));
-    LSP_DEBUG() << ToJSON(wxEmptyString).format(true) << endl;
+    LSP_DEBUG() << ToJSON().format(true) << endl;
 }
 
 void WorkspaceExecuteCommand::OnResponse(const LSP::ResponseMessage& response, wxEvtHandler* owner)
diff --git a/CodeLite/LSP/WorkspaceSymbolRequest.cpp b/CodeLite/LSP/WorkspaceSymbolRequest.cpp
index ce346b207c..9e36a4ff0e 100644
--- a/CodeLite/LSP/WorkspaceSymbolRequest.cpp
+++ b/CodeLite/LSP/WorkspaceSymbolRequest.cpp
@@ -30,13 +30,13 @@ class WorkspaceSymbolParams : public Params
 
 public:
     WorkspaceSymbolParams() = default;
-    virtual ~WorkspaceSymbolParams() = default;
+    ~WorkspaceSymbolParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json) { m_query = json["query"].toString(); }
+    void FromJSON(const JSONItem& json) override { m_query = json["query"].toString(); }
 
-    virtual JSONItem ToJSON(const wxString& name) const
+    JSONItem ToJSON() const override
     {
-        JSONItem json = JSONItem::createObject(name);
+        JSONItem json = JSONItem::createObject();
         json.addProperty("query", m_query);
         return json;
     }
diff --git a/CodeLite/LSP/basic_types.cpp b/CodeLite/LSP/basic_types.cpp
index 9e6e951587..8c0392201c 100644
--- a/CodeLite/LSP/basic_types.cpp
+++ b/CodeLite/LSP/basic_types.cpp
@@ -39,9 +39,9 @@ void TextDocumentIdentifier::FromJSON(const JSONItem& json)
     URI::FromString(json.namedObject("uri").toString(), &m_filename);
 }
 
-JSONItem TextDocumentIdentifier::ToJSON(const wxString& name) const
+JSONItem TextDocumentIdentifier::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("uri", GetPathAsURI());
     return json;
 }
@@ -55,9 +55,9 @@ void VersionedTextDocumentIdentifier::FromJSON(const JSONItem& json)
     m_version = json.namedObject("version").toInt(m_version);
 }
 
-JSONItem VersionedTextDocumentIdentifier::ToJSON(const wxString& name) const
+JSONItem VersionedTextDocumentIdentifier::ToJSON() const
 {
-    JSONItem json = TextDocumentIdentifier::ToJSON(name);
+    JSONItem json = TextDocumentIdentifier::ToJSON();
     json.addProperty("version", m_version);
     return json;
 }
@@ -71,9 +71,9 @@ void Position::FromJSON(const JSONItem& json)
     m_character = json.namedObject("character").toInt(wxNOT_FOUND);
 }
 
-JSONItem Position::ToJSON(const wxString& name) const
+JSONItem Position::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("line", m_line);
     json.addProperty("character", m_character);
     return json;
@@ -91,9 +91,9 @@ void TextDocumentItem::FromJSON(const JSONItem& json)
     m_text = json.namedObject("text").toString();
 }
 
-JSONItem TextDocumentItem::ToJSON(const wxString& name) const
+JSONItem TextDocumentItem::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("uri", GetPathAsURI())
         .addProperty("languageId", GetLanguageId())
         .addProperty("version", GetVersion())
@@ -111,11 +111,11 @@ void TextDocumentContentChangeEvent::FromJSON(const JSONItem& json)
     }
 }
 
-JSONItem TextDocumentContentChangeEvent::ToJSON(const wxString& name) const
+JSONItem TextDocumentContentChangeEvent::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     if (m_range.IsOk()) {
-        json.addProperty("range", m_range.ToJSON("range"));
+        json.addProperty("range", m_range.ToJSON());
     }
     json.addProperty("text", m_text);
     return json;
@@ -127,11 +127,11 @@ void Range::FromJSON(const JSONItem& json)
     m_end.FromJSON(json["end"]);
 }
 
-JSONItem Range::ToJSON(const wxString& name) const
+JSONItem Range::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("start", m_start.ToJSON("start"));
-    json.addProperty("end", m_end.ToJSON("end"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("start", m_start.ToJSON());
+    json.addProperty("end", m_end.ToJSON());
     return json;
 }
 
@@ -143,11 +143,11 @@ void Location::FromJSON(const JSONItem& json)
     m_name = json["name"].toString();
 }
 
-JSONItem Location::ToJSON(const wxString& name) const
+JSONItem Location::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("uri", GetPathAsURI());
-    json.addProperty("range", m_range.ToJSON("range"));
+    json.addProperty("range", m_range.ToJSON());
     json.addProperty("pattern", m_pattern);
     json.addProperty("name", m_name);
     return json;
@@ -159,11 +159,11 @@ void TextEdit::FromJSON(const JSONItem& json)
     m_newText = json.namedObject("newText").toString();
 }
 
-JSONItem TextEdit::ToJSON(const wxString& name) const
+JSONItem TextEdit::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("newText", m_newText);
-    json.addProperty("range", m_range.ToJSON("range"));
+    json.addProperty("range", m_range.ToJSON());
     return json;
 }
 
@@ -173,9 +173,9 @@ void ParameterInformation::FromJSON(const JSONItem& json)
     m_documentation = json.namedObject("documentation").toString();
 }
 
-JSONItem ParameterInformation::ToJSON(const wxString& name) const
+JSONItem ParameterInformation::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("label", m_label);
     json.addProperty("documentation", m_documentation);
     return json;
@@ -200,15 +200,15 @@ void SignatureInformation::FromJSON(const JSONItem& json)
     }
 }
 
-JSONItem SignatureInformation::ToJSON(const wxString& name) const
+JSONItem SignatureInformation::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("label", m_label);
     json.addProperty("documentation", m_documentation);
     if (!m_parameters.empty()) {
         JSONItem params = JSONItem::createArray();
         for (const auto& paramInfo : m_parameters) {
-            params.append(paramInfo.ToJSON(""));
+            params.arrayAppend(paramInfo.ToJSON());
         }
         json.addProperty("parameters", params);
     }
@@ -231,12 +231,12 @@ void SignatureHelp::FromJSON(const JSONItem& json)
     m_activeParameter = json.namedObject("activeParameter").toInt(0);
 }
 
-JSONItem SignatureHelp::ToJSON(const wxString& name) const
+JSONItem SignatureHelp::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     JSONItem signatures = JSONItem::createArray();
     for (const SignatureInformation& si : m_signatures) {
-        signatures.arrayAppend(si.ToJSON(""));
+        signatures.arrayAppend(si.ToJSON());
     }
     json.addProperty("signatures", signatures);
     json.addProperty("activeSignature", m_activeSignature);
@@ -250,9 +250,9 @@ void MarkupContent::FromJSON(const JSONItem& json)
     m_value = json.namedObject("value").toString();
 }
 
-JSONItem MarkupContent::ToJSON(const wxString& name) const
+JSONItem MarkupContent::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("kind", m_kind);
     json.addProperty("value", m_value);
     return json;
@@ -264,11 +264,11 @@ void Hover::FromJSON(const JSONItem& json)
     m_range.FromJSON(json.namedObject("range"));
 }
 
-JSONItem Hover::ToJSON(const wxString& name) const
+JSONItem Hover::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("contents", m_contents.ToJSON("contents"));
-    json.addProperty("range", m_range.ToJSON("range"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("contents", m_contents.ToJSON());
+    json.addProperty("range", m_range.ToJSON());
     return json;
 }
 
@@ -282,10 +282,10 @@ void Diagnostic::FromJSON(const JSONItem& json)
     m_severity = json.namedObject("severity").fromNumber(DiagnosticSeverity::Error);
 }
 
-JSONItem Diagnostic::ToJSON(const wxString& name) const
+JSONItem Diagnostic::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("range", m_range.ToJSON("range"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("range", m_range.ToJSON());
     json.addProperty("message", GetMessage());
     json.addProperty("severity", (int)m_severity);
     return json;
@@ -324,7 +324,7 @@ void DocumentSymbol::FromJSON(const JSONItem& json)
     }
 }
 
-JSONItem DocumentSymbol::ToJSON(const wxString& name) const
+JSONItem DocumentSymbol::ToJSON() const
 {
     wxASSERT_MSG(false, "DocumentSymbol::ToJSON(): is not implemented");
     return JSONItem(nullptr);
@@ -353,13 +353,13 @@ void SymbolInformation::FromJSON(const JSONItem& json)
     }
 }
 
-JSONItem SymbolInformation::ToJSON(const wxString& name) const
+JSONItem SymbolInformation::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("kind", (int)kind);
     json.addProperty("containerName", containerName);
-    json.addProperty("location", location.ToJSON("location"));
-    json.addProperty("name", this->name);
+    json.addProperty("location", location.ToJSON());
+    json.addProperty("name", name);
     return json;
 }
 
@@ -407,7 +407,7 @@ void Command::FromJSON(const JSONItem& json)
 }
 
 // unimplemented
-JSONItem Command::ToJSON(const wxString& name) const { return {}; }
+JSONItem Command::ToJSON() const { return {}; }
 
 std::unordered_map<wxString, std::vector<LSP::TextEdit>> ParseWorkspaceEdit(const JSONItem& result)
 {
diff --git a/CodeLite/LSP/basic_types.h b/CodeLite/LSP/basic_types.h
index 23f003e8fe..0cf4067ecd 100644
--- a/CodeLite/LSP/basic_types.h
+++ b/CodeLite/LSP/basic_types.h
@@ -77,7 +77,7 @@ class WXDLLIMPEXP_CL Position : public Serializable
 
 public:
     void FromJSON(const JSONItem& json) override;
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
 
     Position(int line, int col)
         : m_line(line)
@@ -113,8 +113,8 @@ class WXDLLIMPEXP_CL Range : public Serializable
     Position m_end;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     Range(const Position& start, const Position& end)
         : m_start(start)
@@ -147,8 +147,8 @@ class WXDLLIMPEXP_CL TextDocumentContentChangeEvent : public Serializable
     Range m_range; // Optional
 
 public:
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
 
     TextDocumentContentChangeEvent() = default;
     TextDocumentContentChangeEvent(const wxString& text)
@@ -170,8 +170,8 @@ class WXDLLIMPEXP_CL TextDocumentIdentifier : public Serializable
     URI m_filename;
 
 public:
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
 
     TextDocumentIdentifier() = default;
     TextDocumentIdentifier(const wxString& filename) { URI::FromString(filename, &m_filename); }
@@ -194,8 +194,8 @@ class WXDLLIMPEXP_CL VersionedTextDocumentIdentifier : public TextDocumentIdenti
     int m_version = 1;
 
 public:
-    virtual JSONItem ToJSON(const wxString& name) const;
-    virtual void FromJSON(const JSONItem& json);
+    JSONItem ToJSON() const override;
+    void FromJSON(const JSONItem& json) override;
 
     VersionedTextDocumentIdentifier() = default;
     VersionedTextDocumentIdentifier(int version)
@@ -222,9 +222,9 @@ class WXDLLIMPEXP_CL TextEdit : public LSP::Serializable
 
 public:
     TextEdit() = default;
-    virtual ~TextEdit() = default;
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    ~TextEdit() override = default;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     void SetNewText(const wxString& newText) { this->m_newText = newText; }
     void SetRange(const Range& range) { this->m_range = range; }
     const wxString& GetNewText() const { return m_newText; }
@@ -240,8 +240,8 @@ class WXDLLIMPEXP_CL Location : public Serializable
     wxString m_name;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     Location(const wxString& uri, const Range& range)
         : m_range(range)
@@ -282,8 +282,8 @@ class WXDLLIMPEXP_CL TextDocumentItem : public Serializable
     int m_version = 1;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     TextDocumentItem(const wxString& uri, const wxString& langId, const wxString& text, int version = 1)
         : m_languageId(langId)
@@ -343,8 +343,8 @@ class WXDLLIMPEXP_CL ParameterInformation : public LSP::Serializable
     }
     const wxString& GetDocumentation() const { return m_documentation; }
     const wxString& GetLabel() const { return m_label; }
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     using Vec_t = std::vector<ParameterInformation>;
 };
@@ -379,8 +379,8 @@ class WXDLLIMPEXP_CL SignatureInformation : public LSP::Serializable
     }
     const wxString& GetDocumentation() const { return m_documentation; }
     const wxString& GetLabel() const { return m_label; }
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 };
 
 class WXDLLIMPEXP_CL SignatureHelp : public LSP::Serializable
@@ -411,8 +411,8 @@ class WXDLLIMPEXP_CL SignatureHelp : public LSP::Serializable
     int GetActiveParameter() const { return m_activeParameter; }
     int GetActiveSignature() const { return m_activeSignature; }
     const SignatureInformation::Vec_t& GetSignatures() const { return m_signatures; }
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 };
 
 class WXDLLIMPEXP_CL MarkupContent : public LSP::Serializable
@@ -435,8 +435,8 @@ class WXDLLIMPEXP_CL MarkupContent : public LSP::Serializable
         return *this;
     }
     const wxString& GetValue() const { return m_value; }
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 };
 
 class WXDLLIMPEXP_CL Hover : public LSP::Serializable
@@ -459,8 +459,8 @@ class WXDLLIMPEXP_CL Hover : public LSP::Serializable
         return *this;
     }
     const Range& GetRange() const { return m_range; }
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 };
 
 enum DiagnosticSeverity {
@@ -489,8 +489,8 @@ class WXDLLIMPEXP_CL Diagnostic : public Serializable
     DiagnosticSeverity m_severity = DiagnosticSeverity::Error;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     Diagnostic(const Range& range, const wxString& message)
         : m_range(range)
@@ -523,7 +523,7 @@ class WXDLLIMPEXP_CL Command : public Serializable
 
 public:
     void FromJSON(const JSONItem& json) override;
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
 
     Command() = default;
     virtual ~Command() = default;
@@ -574,8 +574,8 @@ class WXDLLIMPEXP_CL DocumentSymbol : public Serializable
     std::vector<DocumentSymbol> children;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     DocumentSymbol() = default;
     virtual ~DocumentSymbol() = default;
@@ -628,8 +628,8 @@ class WXDLLIMPEXP_CL SymbolInformation : public Serializable
     wxString containerName;
 
 public:
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     SymbolInformation() = default;
     virtual ~SymbolInformation() = default;
diff --git a/CodeLite/LSP/json_rpc_params.cpp b/CodeLite/LSP/json_rpc_params.cpp
index 361629d586..1292089da8 100644
--- a/CodeLite/LSP/json_rpc_params.cpp
+++ b/CodeLite/LSP/json_rpc_params.cpp
@@ -12,11 +12,11 @@ void TextDocumentPositionParams::FromJSON(const JSONItem& json)
     m_position.FromJSON(json["position"]);
 }
 
-JSONItem TextDocumentPositionParams::ToJSON(const wxString& name) const
+JSONItem TextDocumentPositionParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
-    json.addProperty("position", m_position.ToJSON("position"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
+    json.addProperty("position", m_position.ToJSON());
     return json;
 }
 
@@ -26,10 +26,10 @@ JSONItem TextDocumentPositionParams::ToJSON(const wxString& name) const
 
 void SemanticTokensParams::FromJSON(const JSONItem& json) { m_textDocument.FromJSON(json["textDocument"]); }
 
-JSONItem SemanticTokensParams::ToJSON(const wxString& name) const
+JSONItem SemanticTokensParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     return json;
 }
 
@@ -39,10 +39,10 @@ JSONItem SemanticTokensParams::ToJSON(const wxString& name) const
 
 void DidOpenTextDocumentParams::FromJSON(const JSONItem& json) { m_textDocument.FromJSON(json["textDocument"]); }
 
-JSONItem DidOpenTextDocumentParams::ToJSON(const wxString& name) const
+JSONItem DidOpenTextDocumentParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     return json;
 }
 
@@ -52,10 +52,10 @@ JSONItem DidOpenTextDocumentParams::ToJSON(const wxString& name) const
 
 void DidCloseTextDocumentParams::FromJSON(const JSONItem& json) { m_textDocument.FromJSON(json["textDocument"]); }
 
-JSONItem DidCloseTextDocumentParams::ToJSON(const wxString& name) const
+JSONItem DidCloseTextDocumentParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     return json;
 }
 
@@ -78,13 +78,13 @@ void DidChangeTextDocumentParams::FromJSON(const JSONItem& json)
     }
 }
 
-JSONItem DidChangeTextDocumentParams::ToJSON(const wxString& name) const
+JSONItem DidChangeTextDocumentParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     JSONItem arr = JSONItem::createArray();
     for (const auto& contentChange : m_contentChanges) {
-        arr.arrayAppend(contentChange.ToJSON(""));
+        arr.arrayAppend(contentChange.ToJSON());
     }
     json.addProperty("contentChanges", arr);
     return json;
@@ -100,10 +100,10 @@ void DidSaveTextDocumentParams::FromJSON(const JSONItem& json)
     m_text = json["text"].toString();
 }
 
-JSONItem DidSaveTextDocumentParams::ToJSON(const wxString& name) const
+JSONItem DidSaveTextDocumentParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     json.addProperty("text", m_text);
     return json;
 }
@@ -114,9 +114,9 @@ JSONItem DidSaveTextDocumentParams::ToJSON(const wxString& name) const
 
 void CompletionParams::FromJSON(const JSONItem& json) { TextDocumentPositionParams::FromJSON(json); }
 
-JSONItem CompletionParams::ToJSON(const wxString& name) const
+JSONItem CompletionParams::ToJSON() const
 {
-    JSONItem json = TextDocumentPositionParams::ToJSON(name);
+    JSONItem json = TextDocumentPositionParams::ToJSON();
     return json;
 }
 
@@ -131,9 +131,9 @@ ExecuteCommandParams::ExecuteCommandParams(const wxString& command, const wxStri
 
 void ExecuteCommandParams::FromJSON(const JSONItem& json) { wxUnusedVar(json); }
 
-JSONItem ExecuteCommandParams::ToJSON(const wxString& name) const
+JSONItem ExecuteCommandParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
+    JSONItem json = JSONItem::createObject();
     json.addProperty("command", m_command);
     // parse the "arguments"
     // and add them
@@ -150,17 +150,17 @@ JSONItem ExecuteCommandParams::ToJSON(const wxString& name) const
 
 void CodeActionParams::FromJSON(const JSONItem& json) { wxUnusedVar(json); }
 
-JSONItem CodeActionParams::ToJSON(const wxString& name) const
+JSONItem CodeActionParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
-    json.addProperty("range", m_range.ToJSON("range"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
+    json.addProperty("range", m_range.ToJSON());
 
     // add empty context
     auto context = json.AddObject("context");
     auto diags_arr = context.AddArray("diagnostics"); // empty array
     for(const auto& diag : m_diagnostics) {
-        diags_arr.arrayAppend(diag.ToJSON(wxEmptyString));
+        diags_arr.arrayAppend(diag.ToJSON());
     }
     return json;
 }
@@ -171,10 +171,10 @@ JSONItem CodeActionParams::ToJSON(const wxString& name) const
 
 void DocumentSymbolParams::FromJSON(const JSONItem& json) { m_textDocument.FromJSON(json["textDocument"]); }
 
-JSONItem DocumentSymbolParams::ToJSON(const wxString& name) const
+JSONItem DocumentSymbolParams::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(name);
-    json.addProperty("textDocument", m_textDocument.ToJSON("textDocument"));
+    JSONItem json = JSONItem::createObject();
+    json.addProperty("textDocument", m_textDocument.ToJSON());
     return json;
 }
 
@@ -189,9 +189,9 @@ void ReferenceParams::FromJSON(const JSONItem& json)
     m_includeDeclaration = json["context"]["includeDeclaration"].toBool(m_includeDeclaration);
 }
 
-JSONItem ReferenceParams::ToJSON(const wxString& name) const
+JSONItem ReferenceParams::ToJSON() const
 {
-    JSONItem json = TextDocumentPositionParams::ToJSON(name);
+    JSONItem json = TextDocumentPositionParams::ToJSON();
     auto context = json.AddObject("context");
     context.addProperty("includeDeclaration", m_includeDeclaration);
     return json;
@@ -199,9 +199,9 @@ JSONItem ReferenceParams::ToJSON(const wxString& name) const
 
 void RenameParams::FromJSON(const JSONItem& json) { wxUnusedVar(json); }
 
-JSONItem RenameParams::ToJSON(const wxString& name) const
+JSONItem RenameParams::ToJSON() const
 {
-    JSONItem json = TextDocumentPositionParams::ToJSON(name);
+    JSONItem json = TextDocumentPositionParams::ToJSON();
     json.addProperty("newName", m_newName);
     return json;
 }
diff --git a/CodeLite/LSP/json_rpc_params.h b/CodeLite/LSP/json_rpc_params.h
index f1238b9c14..bcf19ac63a 100644
--- a/CodeLite/LSP/json_rpc_params.h
+++ b/CodeLite/LSP/json_rpc_params.h
@@ -35,10 +35,10 @@ class WXDLLIMPEXP_CL TextDocumentPositionParams : public Params
 
 public:
     TextDocumentPositionParams() = default;
-    virtual ~TextDocumentPositionParams() = default;
+    ~TextDocumentPositionParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     void SetPosition(const Position& position) { this->m_position = position; }
     void SetTextDocument(const TextDocumentIdentifier& textDocument) { this->m_textDocument = textDocument; }
@@ -60,10 +60,10 @@ class WXDLLIMPEXP_CL RenameParams : public TextDocumentPositionParams
 
 public:
     RenameParams() = default;
-    virtual ~RenameParams() = default;
+    ~RenameParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     void SetNewName(const wxString& newName) { this->m_newName = newName; }
     const wxString& GetNewName() const { return m_newName; }
 };
@@ -77,10 +77,10 @@ class WXDLLIMPEXP_CL ReferenceParams : public TextDocumentPositionParams
 
 public:
     ReferenceParams(bool includeDeclaration);
-    virtual ~ReferenceParams() = default;
+    ~ReferenceParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     void SetIncludeDeclaration(bool includeDeclaration) { this->m_includeDeclaration = includeDeclaration; }
     bool IsIncludeDeclaration() const { return m_includeDeclaration; }
 };
@@ -94,10 +94,10 @@ class WXDLLIMPEXP_CL SemanticTokensParams : public Params
 
 public:
     SemanticTokensParams() = default;
-    virtual ~SemanticTokensParams() = default;
+    ~SemanticTokensParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     void SetTextDocument(const TextDocumentIdentifier& textDocument) { this->m_textDocument = textDocument; }
     const TextDocumentIdentifier& GetTextDocument() const { return m_textDocument; }
@@ -119,10 +119,10 @@ class WXDLLIMPEXP_CL DocumentSymbolParams : public Params
 
 public:
     DocumentSymbolParams() = default;
-    virtual ~DocumentSymbolParams() = default;
+    ~DocumentSymbolParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     void SetTextDocument(const TextDocumentIdentifier& textDocument) { this->m_textDocument = textDocument; }
     const TextDocumentIdentifier& GetTextDocument() const { return m_textDocument; }
@@ -135,10 +135,10 @@ class WXDLLIMPEXP_CL CompletionParams : public TextDocumentPositionParams
 {
 public:
     CompletionParams() = default;
-    virtual ~CompletionParams() = default;
+    ~CompletionParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 };
 
 //===----------------------------------------------------------------------------------
@@ -151,10 +151,10 @@ class WXDLLIMPEXP_CL ExecuteCommandParams : public Params
 
 public:
     ExecuteCommandParams(const wxString& command, const wxString& arguments);
-    virtual ~ExecuteCommandParams() = default;
+    ~ExecuteCommandParams() = default;
 
     void FromJSON(const JSONItem& json) override;
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
 };
 
 //===----------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ class WXDLLIMPEXP_CL CodeActionParams : public Params
     virtual ~CodeActionParams() = default;
 
     void FromJSON(const JSONItem& json) override;
-    JSONItem ToJSON(const wxString& name) const override;
+    JSONItem ToJSON() const override;
 
     void SetTextDocument(const TextDocumentIdentifier& textDocument) { this->m_textDocument = textDocument; }
     const TextDocumentIdentifier& GetTextDocument() const { return m_textDocument; }
@@ -192,10 +192,10 @@ class WXDLLIMPEXP_CL DidOpenTextDocumentParams : public Params
 
 public:
     DidOpenTextDocumentParams() = default;
-    virtual ~DidOpenTextDocumentParams() = default;
+    ~DidOpenTextDocumentParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
 
     DidOpenTextDocumentParams& SetTextDocument(const TextDocumentItem& textDocument)
     {
@@ -214,10 +214,10 @@ class WXDLLIMPEXP_CL DidCloseTextDocumentParams : public Params
 
 public:
     DidCloseTextDocumentParams() = default;
-    virtual ~DidCloseTextDocumentParams() = default;
+    ~DidCloseTextDocumentParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     DidCloseTextDocumentParams& SetTextDocument(const TextDocumentIdentifier& textDocument)
     {
         this->m_textDocument = textDocument;
@@ -236,10 +236,10 @@ class WXDLLIMPEXP_CL DidChangeTextDocumentParams : public Params
 
 public:
     DidChangeTextDocumentParams() = default;
-    virtual ~DidChangeTextDocumentParams() = default;
+    ~DidChangeTextDocumentParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     DidChangeTextDocumentParams& SetContentChanges(const std::vector<TextDocumentContentChangeEvent>& contentChanges)
     {
         this->m_contentChanges = contentChanges;
@@ -264,10 +264,10 @@ class WXDLLIMPEXP_CL DidSaveTextDocumentParams : public Params
 
 public:
     DidSaveTextDocumentParams() = default;
-    virtual ~DidSaveTextDocumentParams() = default;
+    ~DidSaveTextDocumentParams() override = default;
 
-    virtual void FromJSON(const JSONItem& json);
-    virtual JSONItem ToJSON(const wxString& name) const;
+    void FromJSON(const JSONItem& json) override;
+    JSONItem ToJSON() const override;
     DidSaveTextDocumentParams& SetTextDocument(const TextDocumentIdentifier& textDocument)
     {
         this->m_textDocument = textDocument;
diff --git a/CodeLite/LSP/json_rpc_results.h b/CodeLite/LSP/json_rpc_results.h
index f481f1057b..bef286b457 100644
--- a/CodeLite/LSP/json_rpc_results.h
+++ b/CodeLite/LSP/json_rpc_results.h
@@ -19,9 +19,9 @@ class WXDLLIMPEXP_CL Result : public Serializable
 
 public:
     Result() = default;
-    virtual ~Result() = default;
+    ~Result() override = default;
     template <typename T> T* As() const { return dynamic_cast<T*>(const_cast<Result*>(this)); }
-    virtual JSONItem ToJSON(const wxString& name) const { return JSONItem(nullptr); }
+    JSONItem ToJSON() const override { return JSONItem(nullptr); }
 };
 
 //===----------------------------------------------------------------------------------
diff --git a/CodeLite/ssh/ssh_account_info.cpp b/CodeLite/ssh/ssh_account_info.cpp
index 6b4bdcf067..7becb72c52 100644
--- a/CodeLite/ssh/ssh_account_info.cpp
+++ b/CodeLite/ssh/ssh_account_info.cpp
@@ -57,7 +57,7 @@ void SSHAccountInfo::FromJSON(const JSONItem& json)
 
 JSONItem SSHAccountInfo::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_accountName", m_accountName);
     element.addProperty("m_username", m_username);
     element.addProperty("m_port", m_port);
diff --git a/CodeLite/tags_options_data.cpp b/CodeLite/tags_options_data.cpp
index eddc3bee7d..3ee143d7a1 100644
--- a/CodeLite/tags_options_data.cpp
+++ b/CodeLite/tags_options_data.cpp
@@ -596,7 +596,7 @@ void TagsOptionsData::FromJSON(const JSONItem& json)
 
 JSONItem TagsOptionsData::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("version", m_version);
     json.addProperty("m_ccFlags", m_ccFlags);
     json.addProperty("m_ccColourFlags", m_ccColourFlags);
diff --git a/DatabaseExplorer/db_explorer_settings.cpp b/DatabaseExplorer/db_explorer_settings.cpp
index 68665d5c11..b2e6ea3c20 100644
--- a/DatabaseExplorer/db_explorer_settings.cpp
+++ b/DatabaseExplorer/db_explorer_settings.cpp
@@ -100,7 +100,7 @@ void DbExplorerSettings::FromJSON(const JSONItem& json)
 
 JSONItem DbExplorerSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_recentFiles", m_recentFiles);
     element.addProperty("m_sqlHistory", m_sqlHistory);
 
@@ -125,7 +125,7 @@ DbConnectionInfo::DbConnectionInfo()
 
 JSONItem DbConnectionInfo::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_connectionName", m_connectionName);
     element.addProperty("m_connectionType", m_connectionType);
     element.addProperty("m_defaultDatabase", m_defaultDatabase);
diff --git a/Docker/clDockerSettings.cpp b/Docker/clDockerSettings.cpp
index 3ff27b5140..673acd4392 100644
--- a/Docker/clDockerSettings.cpp
+++ b/Docker/clDockerSettings.cpp
@@ -45,7 +45,7 @@ void clDockerSettings::FromJSON(const JSONItem& json)
 
 JSONItem clDockerSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("docker", m_docker.GetFullPath());
     json.addProperty("docker-compose", m_dockerCompose.GetFullPath());
     json.addProperty("flags", m_flags);
diff --git a/Docker/clDockerWorkspaceSettings.cpp b/Docker/clDockerWorkspaceSettings.cpp
index 18416e6d8b..826db9b7e5 100644
--- a/Docker/clDockerWorkspaceSettings.cpp
+++ b/Docker/clDockerWorkspaceSettings.cpp
@@ -27,7 +27,7 @@ void clDockerWorkspaceSettings::FromJSON(const JSONItem& json)
 
 JSONItem clDockerWorkspaceSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("Version", DOCKER_VERSION);
     JSONItem files = JSONItem::createArray();
     for (const auto& p : m_files) {
diff --git a/HelpPlugin/HelpPluginSettings.cpp b/HelpPlugin/HelpPluginSettings.cpp
index e18cb120e1..aa0ccceb62 100644
--- a/HelpPlugin/HelpPluginSettings.cpp
+++ b/HelpPlugin/HelpPluginSettings.cpp
@@ -42,7 +42,7 @@ void HelpPluginSettings::FromJSON(const JSONItem& json)
 
 JSONItem HelpPluginSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_cxxDocset", m_cxxDocset);
     json.addProperty("m_phpDocset", m_phpDocset);
     json.addProperty("m_htmlDocset", m_htmlDocset);
diff --git a/LiteEditor/debuggerpane.cpp b/LiteEditor/debuggerpane.cpp
index f75243fd15..6294bdb318 100644
--- a/LiteEditor/debuggerpane.cpp
+++ b/LiteEditor/debuggerpane.cpp
@@ -269,7 +269,7 @@ void DebuggerPaneConfig::FromJSON(const JSONItem& json) { m_windows = json.named
 
 JSONItem DebuggerPaneConfig::ToJSON() const
 {
-    JSONItem e = JSONItem::createObject(GetName());
+    JSONItem e = JSONItem::createObject();
     e.addProperty("m_windows", m_windows);
     return e;
 }
diff --git a/LiteEditor/findreplacedlg.cpp b/LiteEditor/findreplacedlg.cpp
index 603b7462ca..507c8c9ff1 100644
--- a/LiteEditor/findreplacedlg.cpp
+++ b/LiteEditor/findreplacedlg.cpp
@@ -102,7 +102,7 @@ void FindReplaceData::FromJSON(const JSONItem& json)
 
 JSONItem FindReplaceData::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_findString", m_findString);
     element.addProperty("m_replaceString", m_replaceString);
     element.addProperty("m_flags", m_flags);
diff --git a/LiteEditor/setters_getters_dlg.cpp b/LiteEditor/setters_getters_dlg.cpp
index 2f9d7710a9..58e43ebdc7 100644
--- a/LiteEditor/setters_getters_dlg.cpp
+++ b/LiteEditor/setters_getters_dlg.cpp
@@ -516,7 +516,7 @@ void SettersGetterData::FromJSON(const JSONItem& json) { m_flags = json.namedObj
 
 JSONItem SettersGetterData::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_flags", m_flags);
     return element;
 }
diff --git a/MemCheck/memchecksettings.cpp b/MemCheck/memchecksettings.cpp
index 93df7b7335..882d1182a4 100644
--- a/MemCheck/memchecksettings.cpp
+++ b/MemCheck/memchecksettings.cpp
@@ -45,7 +45,7 @@ void ValgrindSettings::FromJSON(const JSONItem& json)
 
 JSONItem ValgrindSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_binary", m_binary);
     element.addProperty("m_outputInPrivateFolder", m_outputInPrivateFolder);
     element.addProperty("m_outputFile", m_outputFile);
@@ -91,7 +91,7 @@ void MemCheckSettings::FromJSON(const JSONItem& json)
 
 JSONItem MemCheckSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_engine", m_engine);
     element.addProperty("m_result_page_size", m_result_page_size);
     element.addProperty("m_result_page_size_max", m_result_page_size_max);
diff --git a/PHPLint/lintoptions.cpp b/PHPLint/lintoptions.cpp
index 0b1c949b8d..da68ac4ca0 100644
--- a/PHPLint/lintoptions.cpp
+++ b/PHPLint/lintoptions.cpp
@@ -76,7 +76,7 @@ void LintOptions::FromJSON(const JSONItem& json)
 
 JSONItem LintOptions::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("lintOnFileLoad", m_lintOnFileLoad);
     element.addProperty("lintOnFileSave", m_lintOnFileSave);
     element.addProperty("phpcsPhar", m_phpcsPhar);
diff --git a/PHPRefactoring/phprefactoringoptions.cpp b/PHPRefactoring/phprefactoringoptions.cpp
index 3cc35f0b74..a417cac3e2 100644
--- a/PHPRefactoring/phprefactoringoptions.cpp
+++ b/PHPRefactoring/phprefactoringoptions.cpp
@@ -24,7 +24,7 @@ void PHPRefactoringOptions::FromJSON(const JSONItem& json)
 
 JSONItem PHPRefactoringOptions::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("phprefactoringPhar", m_phprefactoringPhar);
     element.addProperty("skipPreview", m_skipPreview);
     return element;
diff --git a/Plugin/CodeLiteRemoteHelper.cpp b/Plugin/CodeLiteRemoteHelper.cpp
index a8f0449818..03c2e6c9a0 100644
--- a/Plugin/CodeLiteRemoteHelper.cpp
+++ b/Plugin/CodeLiteRemoteHelper.cpp
@@ -94,7 +94,7 @@ void add_formatter_tool(JSONItem& tools_arr, const wxString& name, const wxStrin
     tool.addProperty("name", name);
     tool.addProperty("command", command);
     tool.addProperty("working_directory", wd);
-    tools_arr.arrayAppend(tool);
+    tools_arr.arrayAppend(std::move(tool));
 }
 } // namespace
 
diff --git a/Plugin/ColoursAndFontsManager.cpp b/Plugin/ColoursAndFontsManager.cpp
index 90ec9dc096..271659c9df 100644
--- a/Plugin/ColoursAndFontsManager.cpp
+++ b/Plugin/ColoursAndFontsManager.cpp
@@ -1159,7 +1159,7 @@ bool ColoursAndFontsManager::ExportThemesToFile(const wxFileName& outputFile, co
         }
     }
     for (const auto& lexer : Lexers) {
-        arr.append(lexer->ToJSON(true));
+        arr.arrayAppend(lexer->ToJSON(true));
     }
     return FileUtils::WriteFileContent(outputFile, root.toElement().format());
 }
diff --git a/Plugin/Diff/DiffConfig.cpp b/Plugin/Diff/DiffConfig.cpp
index 9bf3b2c361..b59a6b5c6b 100644
--- a/Plugin/Diff/DiffConfig.cpp
+++ b/Plugin/Diff/DiffConfig.cpp
@@ -42,7 +42,7 @@ void DiffConfig::FromJSON(const JSONItem& json)
 
 JSONItem DiffConfig::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_flags", m_flags);
     element.addProperty("m_viewFlags", m_viewFlags);
     element.addProperty("m_leftFile", m_leftFile);
diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp
index de19904893..60e295f943 100644
--- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp
+++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp
@@ -49,9 +49,9 @@ std::pair<JSONItem, JSONItem> clFileSystemWorkspaceConfig::ToJSON() const
 
     for (const auto& vt : m_buildTargets) {
         JSONItem target = JSONItem::createArray();
-        arrTargets.arrayAppend(target);
         target.arrayAppend(vt.first);
         target.arrayAppend(vt.second);
+        arrTargets.arrayAppend(std::move(target));
     }
 
     shared.addProperty("file_extensions", m_fileExtensions);
diff --git a/Plugin/Keyboard/clKeyboardBindingConfig.cpp b/Plugin/Keyboard/clKeyboardBindingConfig.cpp
index 359250c5ad..68473f7729 100644
--- a/Plugin/Keyboard/clKeyboardBindingConfig.cpp
+++ b/Plugin/Keyboard/clKeyboardBindingConfig.cpp
@@ -70,7 +70,7 @@ clKeyboardBindingConfig& clKeyboardBindingConfig::Save()
         binding.addProperty("parentMenu", menuItem.parentMenu);
         binding.addProperty("description", menuItem.action);
         binding.addProperty("accelerator", menuItem.accel.ToString());
-        menuArr.arrayAppend(binding);
+        menuArr.arrayAppend(std::move(binding));
     }
     mainObj.addProperty("menus", menuArr);
     wxFileName fn(clStandardPaths::Get().GetUserDataDir(), "keybindings.conf");
diff --git a/Plugin/LSP/LSPManager.cpp b/Plugin/LSP/LSPManager.cpp
index 7eadbb0720..84354a967b 100644
--- a/Plugin/LSP/LSPManager.cpp
+++ b/Plugin/LSP/LSPManager.cpp
@@ -478,7 +478,7 @@ void Manager::OnSymbolFound(LSPEvent& event)
             editor->SelectRangeAfter(location.GetRange());
         }
         BrowseRecord current_location{location};
-        clDEBUG() << "location:" << location.ToJSON("").format() << endl;
+        clDEBUG() << "location:" << location.ToJSON().format() << endl;
         clDEBUG() << "Calling StoreCurrentLocation with:" << current_location << endl;
         NavMgr::Get()->StoreCurrentLocation(from, current_location);
     };
diff --git a/Plugin/LSP/LanguageServerConfig.cpp b/Plugin/LSP/LanguageServerConfig.cpp
index 5ba0f9efbb..65f2a489be 100644
--- a/Plugin/LSP/LanguageServerConfig.cpp
+++ b/Plugin/LSP/LanguageServerConfig.cpp
@@ -49,11 +49,11 @@ void LanguageServerConfig::FromJSON(const JSONItem& json)
 
 JSONItem LanguageServerConfig::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("flags", m_flags);
     JSONItem servers = JSONItem::createArray();
     for (const auto& p : m_servers) {
-        servers.append(p.second.ToJSON());
+        servers.arrayAppend(p.second.ToJSON());
     }
     json.addProperty("servers", servers);
     return json;
diff --git a/Plugin/clangd/compilation_database.cpp b/Plugin/clangd/compilation_database.cpp
index 16373b49fa..b1a89f1e8d 100644
--- a/Plugin/clangd/compilation_database.cpp
+++ b/Plugin/clangd/compilation_database.cpp
@@ -394,7 +394,7 @@ wxFileName CompilationDatabase::ConvertCodeLiteCompilationDatabaseToCMake(const
             element.addProperty("directory", cwd);
             element.addProperty("command", cmp_flags);
             element.addProperty("file", file_name);
-            arr.arrayAppend(element);
+            arr.arrayAppend(std::move(element));
         }
 
         wxFileName fn(compile_file.GetPath(), "compile_commands.json");
diff --git a/Plugin/lexer_configuration.cpp b/Plugin/lexer_configuration.cpp
index d4385d4894..866ea6e851 100644
--- a/Plugin/lexer_configuration.cpp
+++ b/Plugin/lexer_configuration.cpp
@@ -434,7 +434,7 @@ void LexerConf::SetLineNumbersFgColour(const wxColour& colour)
 
 JSONItem LexerConf::ToJSON(bool forExport) const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("Name", GetName());
     json.addProperty("Theme", GetThemeName());
     json.addProperty("Flags", m_flags);
diff --git a/Plugin/phpoptions.cpp b/Plugin/phpoptions.cpp
index c76d8244c3..80ebb0e6ca 100644
--- a/Plugin/phpoptions.cpp
+++ b/Plugin/phpoptions.cpp
@@ -68,7 +68,7 @@ void PhpOptions::FromJSON(const JSONItem& json)
 
 JSONItem PhpOptions::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_phpExe", m_phpExe);
     element.addProperty("m_errorReporting", m_errorReporting);
     element.addProperty("m_includePaths", m_includePaths);
diff --git a/Plugin/plugindata.cpp b/Plugin/plugindata.cpp
index 1a3c0555bf..45dc955a77 100644
--- a/Plugin/plugindata.cpp
+++ b/Plugin/plugindata.cpp
@@ -93,7 +93,7 @@ void PluginInfoArray::FromJSON(const JSONItem& json)
 
 JSONItem PluginInfoArray::ToJSON() const
 {
-    JSONItem el = JSONItem::createObject(GetName());
+    JSONItem el = JSONItem::createObject();
     el.addProperty("enabledPlugins", m_enabledPlugins);
     return el;
 }
diff --git a/Plugin/sftp_settings.cpp b/Plugin/sftp_settings.cpp
index c017f3126c..e0fd7c8984 100644
--- a/Plugin/sftp_settings.cpp
+++ b/Plugin/sftp_settings.cpp
@@ -60,11 +60,11 @@ void SFTPSettings::FromJSON(const JSONItem& json)
 
 JSONItem SFTPSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("sshClient", m_sshClient);
     JSONItem arrAccounts = JSONItem::createArray();
     for(size_t i = 0; i < m_accounts.size(); ++i) {
-        arrAccounts.append(m_accounts.at(i).ToJSON());
+        arrAccounts.arrayAppend(m_accounts.at(i).ToJSON());
     }
     element.addProperty("accounts", arrAccounts);
     return element;
diff --git a/SFTP/sftp_workspace_settings.cpp b/SFTP/sftp_workspace_settings.cpp
index ac63f5a2a8..4fc94bfde3 100644
--- a/SFTP/sftp_workspace_settings.cpp
+++ b/SFTP/sftp_workspace_settings.cpp
@@ -38,7 +38,7 @@ void SFTPWorkspaceSettings::FromJSON(const JSONItem& json)
 
 JSONItem SFTPWorkspaceSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_account", m_account);
     element.addProperty("m_remoteWorkspacePath", m_remoteWorkspacePath);
     return element;
diff --git a/SmartCompletion/SmartCompletionsConfig.cpp b/SmartCompletion/SmartCompletionsConfig.cpp
index 9fd30ad891..a0b51e2cee 100644
--- a/SmartCompletion/SmartCompletionsConfig.cpp
+++ b/SmartCompletion/SmartCompletionsConfig.cpp
@@ -31,7 +31,7 @@ void SmartCompletionsConfig::FromJSON(const JSONItem& json)
 
 JSONItem SmartCompletionsConfig::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_flags", m_flags);
     return json;
 }
diff --git a/Subversion2/workspacesvnsettings.cpp b/Subversion2/workspacesvnsettings.cpp
index d27db58d97..dd417a269b 100644
--- a/Subversion2/workspacesvnsettings.cpp
+++ b/Subversion2/workspacesvnsettings.cpp
@@ -44,7 +44,7 @@ void WorkspaceSvnSettings::FromJSON(const JSONItem& json) { m_repoPath = json.na
 
 JSONItem WorkspaceSvnSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_repoPath", m_repoPath);
     return json;
 }
diff --git a/WordCompletion/WordCompletionSettings.cpp b/WordCompletion/WordCompletionSettings.cpp
index 01df66f600..828c349e2b 100644
--- a/WordCompletion/WordCompletionSettings.cpp
+++ b/WordCompletion/WordCompletionSettings.cpp
@@ -15,7 +15,7 @@ void WordCompletionSettings::FromJSON(const JSONItem& json)
 
 JSONItem WordCompletionSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_comparisonMethod", m_comparisonMethod);
     element.addProperty("m_enabled", m_enabled);
     return element;
diff --git a/ZoomNavigator/zn_config_item.cpp b/ZoomNavigator/zn_config_item.cpp
index 3ec57e6463..abd7663c98 100644
--- a/ZoomNavigator/zn_config_item.cpp
+++ b/ZoomNavigator/zn_config_item.cpp
@@ -41,7 +41,7 @@ void znConfigItem::FromJSON(const JSONItem& json)
 
 JSONItem znConfigItem::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("m_highlightColour", m_highlightColour);
     element.addProperty("m_enabled", m_enabled);
     element.addProperty("m_zoomFactor", m_zoomFactor);
diff --git a/abbreviation/abbreviationentry.cpp b/abbreviation/abbreviationentry.cpp
index 5a89a5a9c3..ab878fc59e 100644
--- a/abbreviation/abbreviationentry.cpp
+++ b/abbreviation/abbreviationentry.cpp
@@ -49,7 +49,7 @@ void AbbreviationJSONEntry::FromJSON(const JSONItem& json)
 
 JSONItem AbbreviationJSONEntry::ToJSON() const
 {
-    JSONItem ele = JSONItem::createObject(GetName());
+    JSONItem ele = JSONItem::createObject();
     ele.addProperty("entries", m_entries);
     ele.addProperty("autoInsert", m_autoInsert);
     return ele;
diff --git a/codelite_vim/VimSettings.cpp b/codelite_vim/VimSettings.cpp
index 742211625e..b30764eaed 100644
--- a/codelite_vim/VimSettings.cpp
+++ b/codelite_vim/VimSettings.cpp
@@ -10,7 +10,7 @@ void VimSettings::FromJSON(const JSONItem& json) { m_enabled = json.namedObject(
 
 JSONItem VimSettings::ToJSON() const
 {
-    JSONItem element = JSONItem::createObject(GetName());
+    JSONItem element = JSONItem::createObject();
     element.addProperty("enabled", m_enabled);
     return element;
 }
diff --git a/codelitephp/PHPParser/php_configuration_data.cpp b/codelitephp/PHPParser/php_configuration_data.cpp
index 7b3f1d8d00..82ed9cc6bf 100644
--- a/codelitephp/PHPParser/php_configuration_data.cpp
+++ b/codelitephp/PHPParser/php_configuration_data.cpp
@@ -42,7 +42,7 @@ void PHPConfigurationData::FromJSON(const JSONItem& json)
 
 JSONItem PHPConfigurationData::ToJSON() const
 {
-    JSONItem e = JSONItem::createObject(GetName());
+    JSONItem e = JSONItem::createObject();
     e.addProperty("m_xdebugPort", m_xdebugPort);
     e.addProperty("m_xdebugHost", m_xdebugHost);
     e.addProperty("m_ccIncludePath", m_ccIncludePath);
diff --git a/codelitephp/PHPParser/php_project.cpp b/codelitephp/PHPParser/php_project.cpp
index 69b68a35b0..ed96472b42 100644
--- a/codelitephp/PHPParser/php_project.cpp
+++ b/codelitephp/PHPParser/php_project.cpp
@@ -103,7 +103,7 @@ void PHPProject::ToJSON(JSONItem& pro) const
     pro.addProperty("m_isActive", m_isActive);
     pro.addProperty("m_importFileSpec", m_importFileSpec);
     pro.addProperty("m_excludeFolders", m_excludeFolders);
-    pro.append(m_settings.ToJSON());
+    pro.addProperty("settings", m_settings.ToJSON());
 }
 
 wxArrayString& PHPProject::GetFiles(wxProgressDialog* progress)
diff --git a/codelitephp/PHPParser/php_project_settings_data.cpp b/codelitephp/PHPParser/php_project_settings_data.cpp
index 13941a2405..ba3e8b9794 100644
--- a/codelitephp/PHPParser/php_project_settings_data.cpp
+++ b/codelitephp/PHPParser/php_project_settings_data.cpp
@@ -50,7 +50,7 @@ void PHPProjectSettingsData::FromJSON(const JSONItem& ele)
 
 JSONItem PHPProjectSettingsData::ToJSON() const
 {
-    JSONItem settings = JSONItem::createObject("settings");
+    JSONItem settings = JSONItem::createObject();
     settings.addProperty("m_runAs", m_runAs);
     settings.addProperty("m_phpExe", m_phpExe);
     settings.addProperty("m_indexFile", m_indexFile);
diff --git a/codelitephp/php-plugin/ssh_workspace_settings.cpp b/codelitephp/php-plugin/ssh_workspace_settings.cpp
index 6d2f7c89aa..03735eb4a1 100644
--- a/codelitephp/php-plugin/ssh_workspace_settings.cpp
+++ b/codelitephp/php-plugin/ssh_workspace_settings.cpp
@@ -17,7 +17,7 @@ void SSHWorkspaceSettings::FromJSON(const JSONItem& json)
 
 JSONItem SSHWorkspaceSettings::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_account", m_account);
     json.addProperty("m_remoteFolder", m_remoteFolder);
     json.addProperty("m_remoteUploadEnabled", m_remoteUploadEnabled);
diff --git a/ctagsd/lib/ProtocolHandler.cpp b/ctagsd/lib/ProtocolHandler.cpp
index 532608be2f..3f0feddeb5 100644
--- a/ctagsd/lib/ProtocolHandler.cpp
+++ b/ctagsd/lib/ProtocolHandler.cpp
@@ -1091,7 +1091,7 @@ void ProtocolHandler::on_workspace_symbol(std::unique_ptr<JSON>&& msg, Channel::
 
     auto symbols = LSPUtils::to_symbol_information_array(tags, false);
     for (const LSP::SymbolInformation& symbol : symbols) {
-        result.arrayAppend(symbol.ToJSON(wxEmptyString));
+        result.arrayAppend(symbol.ToJSON());
     }
     channel->write_reply(response);
 }
@@ -1139,7 +1139,7 @@ void ProtocolHandler::on_document_symbol(std::unique_ptr<JSON>&& msg, Channel::p
 
     auto symbols = LSPUtils::to_symbol_information_array(tags, true);
     for (const LSP::SymbolInformation& symbol : symbols) {
-        result.arrayAppend(symbol.ToJSON(wxEmptyString));
+        result.arrayAppend(symbol.ToJSON());
     }
     channel->write_reply(response);
 }
@@ -1220,10 +1220,9 @@ void ProtocolHandler::on_document_signature_help(std::unique_ptr<JSON>&& msg, Ch
     }
     JSON root(JsonType::Object);
     JSONItem response = root.toElement();
-    auto result = sh.ToJSON("result");
     response.addProperty("id", id);
     response.addProperty("jsonrpc", "2.0");
-    response.append(result);
+    response.addProperty("result", sh.ToJSON());
     channel->write_reply(response);
 }
 
@@ -1447,7 +1446,7 @@ void ProtocolHandler::do_definition(std::unique_ptr<JSON>&& msg, Channel::ptr_t
         auto match = result.AddObject(wxEmptyString);
         LSP::Range range;
         range.SetStart({0, 0}).SetEnd({0, 0});
-        match.append(range.ToJSON("range"));
+        match.addProperty("range", range.ToJSON());
         match.addProperty("uri", FileUtils::FilePathToURI(file_match));
     } else {
         // add all the results
@@ -1458,7 +1457,7 @@ void ProtocolHandler::do_definition(std::unique_ptr<JSON>&& msg, Channel::ptr_t
             // we can only provide line number...
             LSP::Range range;
             range.SetStart({tag->GetLine() - 1, 0}).SetEnd({tag->GetLine() - 1, 0});
-            match.append(range.ToJSON("range"));
+            match.addProperty("range", range.ToJSON());
             match.addProperty("uri", FileUtils::FilePathToURI(tag->GetFile()));
 
             // we will use this to highlight the selection
diff --git a/git/gitentry.cpp b/git/gitentry.cpp
index f2fdb06b34..f1e3384ead 100644
--- a/git/gitentry.cpp
+++ b/git/gitentry.cpp
@@ -138,7 +138,7 @@ void GitEntry::FromJSON(const JSONItem& json)
 
 JSONItem GitEntry::ToJSON() const
 {
-    JSONItem json = JSONItem::createObject(GetName());
+    JSONItem json = JSONItem::createObject();
     json.addProperty("m_entries", m_entries);
     if (m_colourTrackedFile.IsOk()) {
         json.addProperty("m_colourTrackedFile", m_colourTrackedFile.GetAsString(wxC2S_HTML_SYNTAX));
@@ -416,10 +416,10 @@ void GitCommandsEntries::ToJSON(JSONItem& arr) const
         JSONItem e = JSONItem::createObject();
         e.addProperty("label", command.label);
         e.addProperty("command", command.command);
-        commandsArr.arrayAppend(e);
+        commandsArr.arrayAppend(std::move(e));
     }
     obj.addProperty("m_commands", commandsArr);
-    arr.arrayAppend(obj);
+    arr.arrayAppend(std::move(obj));
 }
 
 const wxString GitWorkspace::GetProjectUserEnteredRepoPath(const wxString& projectName)
@@ -443,10 +443,10 @@ void GitWorkspace::FromJSON(const JSONItem& json)
 void GitWorkspace::ToJSON(JSONItem& arr) const
 {
     if (!GetWorkspaceName().empty()) {
-        JSONItem json = JSONItem::createObject(GetWorkspaceName());
+        JSONItem json = JSONItem::createObject();
         json.addProperty("m_workspaceName", GetWorkspaceName());
         json.addProperty("m_projectData", m_projectData);
         json.addProperty("m_userEnteredRepoPath", m_userEnteredRepoPath);
-        arr.arrayAppend(json);
+        arr.arrayAppend(std::move(json));
     }
 }
diff --git a/wxcrafter/UI/PropertiesView/BmpTextSelectorDlg.cpp b/wxcrafter/UI/PropertiesView/BmpTextSelectorDlg.cpp
index 6f399966c9..05dec082fb 100644
--- a/wxcrafter/UI/PropertiesView/BmpTextSelectorDlg.cpp
+++ b/wxcrafter/UI/PropertiesView/BmpTextSelectorDlg.cpp
@@ -77,7 +77,7 @@ wxString BmpTextSelectorDlg::ToString(const BmpTextVec_t& vec)
         JSONItem element = JSONItem::createObject();
         element.addProperty("bmp", bmp);
         element.addProperty("label", label);
-        root.toElement().arrayAppend(element);
+        root.toElement().arrayAppend(std::move(element));
     }
     wxString asString(root.toElement().format());
     asString.Replace("\n", "");
diff --git a/wxcrafter/src/wxc_project_metadata.cpp b/wxcrafter/src/wxc_project_metadata.cpp
index 6d10a589d6..089b250433 100644
--- a/wxcrafter/src/wxc_project_metadata.cpp
+++ b/wxcrafter/src/wxc_project_metadata.cpp
@@ -210,7 +210,7 @@ void wxcProjectMetadata::Serialize(const wxcWidget::List_t& topLevelsList, const
             JSONItem obj = JSONItem::createObject();
             widget->FixPaths(filename.GetPath()); // Fix abs paths to fit the new project file
             widget->Serialize(obj);
-            windows.arrayAppend(obj);
+            windows.arrayAppend(std::move(obj));
         }
         root.toElement().addProperty("windows", windows);
 
diff --git a/wxcrafter/src/wxc_settings.cpp b/wxcrafter/src/wxc_settings.cpp
index b31bf34cb8..7582bf3617 100644
--- a/wxcrafter/src/wxc_settings.cpp
+++ b/wxcrafter/src/wxc_settings.cpp
@@ -55,7 +55,7 @@ void wxcSettings::Save()
     JSONItem arr = JSONItem::createArray();
 
     for (const auto& p : m_templateClasses) {
-        arr.append(p.second.ToJSON());
+        arr.arrayAppend(p.second.ToJSON());
     }
     root.toElement().addProperty("m_templateClasses", arr);
     root.save(fn);
@@ -123,7 +123,7 @@ JSONItem wxcSettings::GetCustomControlsAsJSON(const wxArrayString& controls) con
     JSONItem arr = JSONItem::createArray();
     for (const auto& p : m_templateClasses) {
         if (controls.Index(p.first) != wxNOT_FOUND) {
-            arr.append(p.second.ToJSON());
+            arr.arrayAppend(p.second.ToJSON());
         }
     }
     return arr;
diff --git a/wxcrafter/src/wxc_widget.cpp b/wxcrafter/src/wxc_widget.cpp
index 28ded1d706..2e49d01bfe 100644
--- a/wxcrafter/src/wxc_widget.cpp
+++ b/wxcrafter/src/wxc_widget.cpp
@@ -660,7 +660,7 @@ void wxcWidget::Serialize(JSONItem& json) const
     for (; child_iter != m_children.end(); child_iter++) {
         JSONItem child = JSONItem::createObject();
         (*child_iter)->Serialize(child);
-        children.arrayAppend(child);
+        children.arrayAppend(std::move(child));
     }
 
     json.addProperty("m_children", children);
diff --git a/wxcrafter/src/wxguicraft_main_view.cpp b/wxcrafter/src/wxguicraft_main_view.cpp
index 8b41323b8d..b7cd00c9a2 100644
--- a/wxcrafter/src/wxguicraft_main_view.cpp
+++ b/wxcrafter/src/wxguicraft_main_view.cpp
@@ -1039,7 +1039,7 @@ JSONItem GUICraftMainPanel::ToJSON(const wxTreeItemId& fromItem)
             itemData->m_wxcWidget->FixPaths(
                 wxcProjectMetadata::Get().GetProjectPath()); // Fix abs paths to fit the new project file
             itemData->m_wxcWidget->Serialize(obj);
-            json.arrayAppend(obj);
+            json.arrayAppend(std::move(obj));
         }
 
         child = m_treeControls->GetNextChild(rootItem, cookie);