diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 8ceb1f71e..254d941e9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -973,7 +973,7 @@ public class DataManagementPlanManager {
     * */
 
     public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader) throws IOException {
-        return this.getWordDocument(id, principal, configLoader, false);
+        return this.getWordDocument(id, principal, configLoader, true);
     }
 
     public FileEnvelope getWordDocument(String id, Principal principal, ConfigLoader configLoader, Boolean versioned) throws IOException {
@@ -1122,11 +1122,9 @@ public class DataManagementPlanManager {
             document.removeBodyElement(0);
         }
 
-        String fileName = "";
+        String fileName = "DMP_" + dmpEntity.getGrant().getLabel();
         if (versioned) {
-            fileName = dmpEntity.getLabel() + " v" + dmpEntity.getVersion();
-        } else {
-            fileName = dmpEntity.getLabel();
+            fileName += "_" + dmpEntity.getVersion();
         }
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
         FileEnvelope exportEnvelope = new FileEnvelope();
@@ -1272,7 +1270,7 @@ public class DataManagementPlanManager {
         writer.close();
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(xmlFile);
-        fileEnvelope.setFilename(dmp.getLabel() + ".xml");
+        fileEnvelope.setFilename("DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion() + ".xml");
 
         return fileEnvelope;
     }
@@ -1286,7 +1284,7 @@ public class DataManagementPlanManager {
 
         /*ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);*/
-        String fileName = dmp.getLabel();
+        String fileName = "DMP_" + dmp.getGrant().getLabel() + "_" + dmp.getVersion();//dmp.getLabel();
         fileName = fileName.replaceAll("[^a-zA-Z0-9+ ]", "");
         String uuid = UUID.randomUUID().toString();
         File file = new File(this.environment.getProperty("temp.temp") + uuid + ".json");