diff --git a/source/backend/CarlaStandaloneNSM.cpp b/source/backend/CarlaStandaloneNSM.cpp
index cbfa68db1..8e30654e0 100644
--- a/source/backend/CarlaStandaloneNSM.cpp
+++ b/source/backend/CarlaStandaloneNSM.cpp
@@ -124,8 +124,13 @@ public:
             fServerURL = lo_server_thread_get_url(fServerThread);
         }
 
+        const char* appName = std::getenv("CARLA_NSM_NAME");
+
+        if (appName == nullptr)
+            appName = "Carla";
+
         lo_send_from(nsmAddress, fServer, LO_TT_IMMEDIATE, "/nsm/server/announce", "sssiii",
-                     "Carla", NSM_CLIENT_FEATURES, executableName, NSM_API_VERSION_MAJOR, NSM_API_VERSION_MINOR, pid);
+                     appName, NSM_CLIENT_FEATURES, executableName, NSM_API_VERSION_MAJOR, NSM_API_VERSION_MINOR, pid);
 
         lo_address_free(nsmAddress);
 
@@ -290,8 +295,13 @@ protected:
         // Broadcast ourselves
         if (fHasBroadcast)
         {
+            const char* appName = std::getenv("CARLA_NSM_NAME");
+
+            if (appName == nullptr)
+                appName = "Carla";
+
             lo_send_from(fReplyAddress, fServer, LO_TT_IMMEDIATE, "/nsm/server/broadcast", "sssss",
-                         "/non/hello", fServerURL, "Carla", CARLA_VERSION_STRING, fClientNameId.buffer());
+                         "/non/hello", fServerURL, appName, CARLA_VERSION_STRING, fClientNameId.buffer());
         }
 
         return 0;
diff --git a/source/carla-jack-multi b/source/carla-jack-multi
index 852606214..3a44c1441 100755
--- a/source/carla-jack-multi
+++ b/source/carla-jack-multi
@@ -33,7 +33,7 @@ if __name__ == '__main__':
     # ------------------------------------------------------------------------------------------------------------------
     # App initialization
 
-    app = CarlaApplication("Carla2-Single-Client", libPrefix)
+    app = CarlaApplication("Carla2-Multi-Client", libPrefix)
 
     # ------------------------------------------------------------------------------------------------------------------
     # Set-up custom signal handling
@@ -43,6 +43,8 @@ if __name__ == '__main__':
     # ------------------------------------------------------------------------------------------------------------------
     # Init host backend
 
+    os.environ["CARLA_NSM_NAME"] = "Carla-Multi-Client"
+
     host = initHost(initName, libPrefix, False, False, True)
     host.audioDriverForced = "JACK"
     host.processMode       = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS
diff --git a/source/carla-jack-single b/source/carla-jack-single
index df512035d..7a7b4a65d 100755
--- a/source/carla-jack-single
+++ b/source/carla-jack-single
@@ -43,6 +43,8 @@ if __name__ == '__main__':
     # ------------------------------------------------------------------------------------------------------------------
     # Init host backend
 
+    os.environ["CARLA_NSM_NAME"] = "Carla-Single-Client"
+
     host = initHost(initName, libPrefix, False, False, True)
     host.audioDriverForced = "JACK"
     host.processMode       = ENGINE_PROCESS_MODE_SINGLE_CLIENT
diff --git a/source/carla-patchbay b/source/carla-patchbay
index 2ce09f79a..dc74e2681 100755
--- a/source/carla-patchbay
+++ b/source/carla-patchbay
@@ -43,6 +43,8 @@ if __name__ == '__main__':
     # ------------------------------------------------------------------------------------------------------------------
     # Init host backend
 
+    os.environ["CARLA_NSM_NAME"] = "Carla-Patchbay"
+
     host = initHost(initName, libPrefix, False, False, True)
     host.processMode       = ENGINE_PROCESS_MODE_PATCHBAY
     host.processModeForced = True
diff --git a/source/carla-rack b/source/carla-rack
index 2e586ff79..c96778532 100755
--- a/source/carla-rack
+++ b/source/carla-rack
@@ -43,6 +43,8 @@ if __name__ == '__main__':
     # ------------------------------------------------------------------------------------------------------------------
     # Init host backend
 
+    os.environ["CARLA_NSM_NAME"] = "Carla-Rack"
+
     host = initHost(initName, libPrefix, False, False, True)
     host.processMode       = ENGINE_PROCESS_MODE_CONTINUOUS_RACK
     host.processModeForced = True