diff --git a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
index 1064552e..20e6b384 100644
--- a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
+++ b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
@@ -95,12 +95,12 @@ private String handleIncomingMessage(int id, String message) {
 				newJson = deserializeJsonAndAnnotate(message);	    				
 	    	}
 	    	else if (message.startsWith("Json2DFD:")) {
-	    		message = message.replaceFirst("Json2DFD:" + name + ":", "");   		
+	    		message = message.replaceFirst("Json2DFD:", "");   		
 				var webEditorDfd = deserializeJson(message);
 			    return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);	
 	    	} 
 	    	else if (message.startsWith("DFD:")) {
-	    		newJson = safeLoadAndConvertDFDString(message);
+	    		newJson = safeLoadAndConvertDFDString(message, name);
 	    	} else {
 	    	    newJson = safeLoadAndConvertPCMString(message);
 	    	}
@@ -143,10 +143,8 @@ private WebEditorDfd deserializeJson(String json){
 		return webEditorDfd;
     }
     
-    private WebEditorDfd safeLoadAndConvertDFDString(String message) {
+    private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {
 		message = message.replaceFirst("DFD:", "");
-		var name = message.split(":")[0];
-		message = message.replaceFirst(name + ":", "");
 		var dfdMessage = message.split("\n:DD:\n")[0];
 		var ddMessage = message.split("\n:DD:\n")[1];
 		try {            
diff --git a/frontend/webEditor/src/features/serialize/loadDFDandDD.ts b/frontend/webEditor/src/features/serialize/loadDFDandDD.ts
index b0a646d0..66133aff 100644
--- a/frontend/webEditor/src/features/serialize/loadDFDandDD.ts
+++ b/frontend/webEditor/src/features/serialize/loadDFDandDD.ts
@@ -83,8 +83,6 @@ export class LoadDFDandDDCommand extends Command {
             // Send each file's content in separate WebSocket messages
             sendMessage(
                 "DFD:" +
-                    this.getFileNameWithoutExtension(dataflowFile) +
-                    ":" +
                     dataflowFileContent +
                     "\n:DD:\n" +
                     dictionaryFileContent,
diff --git a/frontend/webEditor/src/features/serialize/saveDFDandDD.ts b/frontend/webEditor/src/features/serialize/saveDFDandDD.ts
index 201aef25..37ce5d14 100644
--- a/frontend/webEditor/src/features/serialize/saveDFDandDD.ts
+++ b/frontend/webEditor/src/features/serialize/saveDFDandDD.ts
@@ -61,7 +61,7 @@ export class SaveDFDandDDCommand extends Command {
             version: CURRENT_VERSION,
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
-        sendMessage("Json2DFD:" + getModelFileName() + ":" + diagramJson);
+        sendMessage("Json2DFD:" + diagramJson);
         return context.root;
     }