diff --git a/c++/carla-bridge/carla_bridge_client.hpp b/c++/carla-bridge/carla_bridge_client.hpp
index 6579320..faeb60a 100644
--- a/c++/carla-bridge/carla_bridge_client.hpp
+++ b/c++/carla-bridge/carla_bridge_client.hpp
@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef CARLA_BRIDGE_CLIENT_H
-#define CARLA_BRIDGE_CLIENT_H
+#ifndef CARLA_BRIDGE_CLIENT_HPP
+#define CARLA_BRIDGE_CLIENT_HPP
 
 #include "carla_bridge_osc.hpp"
 
@@ -24,6 +24,10 @@
 
 CARLA_BRIDGE_START_NAMESPACE
 
+#if 0
+} // Fix editor indentation
+#endif
+
 /*!
  * @defgroup CarlaBridgeClient Carla Bridge Client
  *
@@ -149,4 +153,4 @@ private:
 
 CARLA_BRIDGE_END_NAMESPACE
 
-#endif // CARLA_BRIDGE_CLIENT_H
+#endif // CARLA_BRIDGE_CLIENT_HPP
diff --git a/c++/carla-bridge/carla_bridge_toolkit-qt.cpp b/c++/carla-bridge/carla_bridge_toolkit-qt.cpp
index 69d5bd6..ed3a80c 100644
--- a/c++/carla-bridge/carla_bridge_toolkit-qt.cpp
+++ b/c++/carla-bridge/carla_bridge_toolkit-qt.cpp
@@ -72,12 +72,12 @@ class CarlaBridgeToolkitQt: public CarlaBridgeToolkit,
                             public QObject
 {
 public:
-    CarlaBridgeToolkitQt(CarlaBridgeClient* const client, const char* const title)
-        : CarlaBridgeToolkit(client, title),
+    CarlaBridgeToolkitQt(CarlaBridgeClient* const client, const char* const uiTitle)
+        : CarlaBridgeToolkit(client, uiTitle),
           QObject(nullptr),
           settings("Cadence", appName)
     {
-        qDebug("CarlaBridgeToolkitQt::CarlaBridgeToolkitQt(\"%s\")", title);
+        qDebug("CarlaBridgeToolkitQt::CarlaBridgeToolkitQt(%p, \"%s\")", client, uiTitle);
 
         app = nullptr;
         window = nullptr;
@@ -154,13 +154,13 @@ public:
 #endif
         }
 
-        window->setWindowTitle(title);
+        window->setWindowTitle(uiTitle);
 
-        if (settings.contains(QString("%1/pos_x").arg(title)))
+        if (settings.contains(QString("%1/pos_x").arg(uiTitle)))
         {
             bool hasX, hasY;
-            int posX = settings.value(QString("%1/pos_x").arg(title), window->x()).toInt(&hasX);
-            int posY = settings.value(QString("%1/pos_y").arg(title), window->y()).toInt(&hasY);
+            int posX = settings.value(QString("%1/pos_x").arg(uiTitle), window->x()).toInt(&hasX);
+            int posY = settings.value(QString("%1/pos_y").arg(uiTitle), window->y()).toInt(&hasY);
 
             if (hasX && hasY)
                 window->move(posX, posY);
@@ -168,8 +168,8 @@ public:
             if (client->isResizable())
             {
                 bool hasWidth, hasHeight;
-                int width  = settings.value(QString("%1/width").arg(title), window->width()).toInt(&hasWidth);
-                int height = settings.value(QString("%1/height").arg(title), window->height()).toInt(&hasHeight);
+                int width  = settings.value(QString("%1/width").arg(uiTitle), window->width()).toInt(&hasWidth);
+                int height = settings.value(QString("%1/height").arg(uiTitle), window->height()).toInt(&hasHeight);
 
                 if (hasWidth && hasHeight)
                     window->resize(width, height);
@@ -203,10 +203,10 @@ public:
         {
             if (client)
             {
-                settings.setValue(QString("%1/pos_x").arg(title), window->x());
-                settings.setValue(QString("%1/pos_y").arg(title), window->y());
-                settings.setValue(QString("%1/width").arg(title), window->width());
-                settings.setValue(QString("%1/height").arg(title), window->height());
+                settings.setValue(QString("%1/pos_x").arg(uiTitle), window->x());
+                settings.setValue(QString("%1/pos_y").arg(uiTitle), window->y());
+                settings.setValue(QString("%1/width").arg(uiTitle), window->width());
+                settings.setValue(QString("%1/height").arg(uiTitle), window->height());
                 settings.sync();
             }
 
@@ -323,9 +323,9 @@ protected:
 
 // -------------------------------------------------------------------------
 
-CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeClient* const client, const char* const title)
+CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeClient* const client, const char* const uiTitle)
 {
-    return new CarlaBridgeToolkitQt(client, title);
+    return new CarlaBridgeToolkitQt(client, uiTitle);
 }
 
 CARLA_BRIDGE_END_NAMESPACE
diff --git a/c++/carla-bridge/carla_bridge_toolkit.cpp b/c++/carla-bridge/carla_bridge_toolkit.cpp
index 4740910..575945c 100644
--- a/c++/carla-bridge/carla_bridge_toolkit.cpp
+++ b/c++/carla-bridge/carla_bridge_toolkit.cpp
@@ -27,16 +27,17 @@ CarlaBridgeToolkit::CarlaBridgeToolkit(CarlaBridgeClient* const client_, const c
     : client(client_)
 {
     qDebug("CarlaBridgeToolkit::CarlaBridgeToolkit(\"%s\")", newTitle);
+    CARLA_ASSERT(client);
     CARLA_ASSERT(newTitle);
 
-    title  = strdup(newTitle ? newTitle : "(null)");
+    uiTitle  = strdup(newTitle ? newTitle : "(null)");
 }
 
 CarlaBridgeToolkit::~CarlaBridgeToolkit()
 {
     qDebug("CarlaBridgeToolkit::~CarlaBridgeToolkit()");
 
-    free(title);
+    free(uiTitle);
 }
 
 #if BUILD_BRIDGE_UI
diff --git a/c++/carla-bridge/carla_bridge_toolkit.hpp b/c++/carla-bridge/carla_bridge_toolkit.hpp
index 08b0ca8..29bdbd4 100644
--- a/c++/carla-bridge/carla_bridge_toolkit.hpp
+++ b/c++/carla-bridge/carla_bridge_toolkit.hpp
@@ -36,7 +36,7 @@ CARLA_BRIDGE_START_NAMESPACE
 class CarlaBridgeToolkit
 {
 public:
-    CarlaBridgeToolkit(CarlaBridgeClient* const client, const char* const title);
+    CarlaBridgeToolkit(CarlaBridgeClient* const client, const char* const uiTitle);
     virtual ~CarlaBridgeToolkit();
 
     virtual void init() = 0;
@@ -50,12 +50,12 @@ public:
 #if BUILD_BRIDGE_UI
     virtual void* getContainerId();
 
-    static CarlaBridgeToolkit* createNew(CarlaBridgeClient* const client, const char* const title);
+    static CarlaBridgeToolkit* createNew(CarlaBridgeClient* const client, const char* const uiTitle);
 #endif
 
 protected:
     CarlaBridgeClient* const client;
-    char* title;
+    char* uiTitle;
 };
 
 /**@}*/