diff --git a/BackendServers/webSocketsServer.js b/BackendServers/webSocketsServer.js
index 57dbc26af..f4737adc8 100644
--- a/BackendServers/webSocketsServer.js
+++ b/BackendServers/webSocketsServer.js
@@ -50,7 +50,7 @@
                             console.log('Message Received: ' + message)
                         }
 
-                        let messageArray = message.split('|')
+                        let messageArray = message.split('|*|')
 
                         let origin = messageArray[0]
                         let nonce = messageArray[1]
diff --git a/CanvasApp/SystemEventHandler.js b/CanvasApp/EventsServerClient.js
similarity index 98%
rename from CanvasApp/SystemEventHandler.js
rename to CanvasApp/EventsServerClient.js
index abf08b292..f5d05ea8f 100644
--- a/CanvasApp/SystemEventHandler.js
+++ b/CanvasApp/EventsServerClient.js
@@ -71,7 +71,7 @@ function newEventsServerClient () {
     commandsWaitingConfirmation.set(stringNonce, command)
     commandsSentByTimestamp.set(stringNonce, timestamp)
 
-    let messageToWebSocketServer = 'Web Browser|' + stringNonce + '|' + JSON.stringify(command)
+    let messageToWebSocketServer = 'Web Browser' + '|*|' + stringNonce + '|*|' + JSON.stringify(command)
     WEB_SOCKETS_CONNECTION.send(messageToWebSocketServer)
   }
 
diff --git a/TaskServer/EventServerClient.js b/TaskServer/EventServerClient.js
index 5f275996b..a094c4314 100644
--- a/TaskServer/EventServerClient.js
+++ b/TaskServer/EventServerClient.js
@@ -123,7 +123,7 @@
         }
 
         if (WEB_SOCKETS_CLIENT.readyState === 1) { // 1 means connected and ready.
-            WEB_SOCKETS_CLIENT.send("Task Server||" + JSON.stringify(command))
+            WEB_SOCKETS_CLIENT.send("Task Server" + "|*|" + "|*|"  + JSON.stringify(command))
         } else {
             console.log('[ERROR] Task Server -> Event Server Client -> setuptWebSockets -> sendCommand -> WebSocket message could not be sent because the connection was not ready. Message = ' + JSON.stringify(command))
         }
diff --git a/WebServer/Scripts/AppLoader.js b/WebServer/Scripts/AppLoader.js
index 9e86ba000..eabe52bcb 100644
--- a/WebServer/Scripts/AppLoader.js
+++ b/WebServer/Scripts/AppLoader.js
@@ -103,7 +103,7 @@ function newAppLoader() {
                 'CockpitSpace/Speedometer.js',
                 'CockpitSpace/FullScreen.js',
 
-                'SystemEventHandler.js',
+                'EventsServerClient.js',
 
                 'VideoRecorder.js',
                 'Plotter.js',