Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r52b858dd710a37035093bd2f9f209e5ad147f33c
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	(.../ExportServlet.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ExportServlet.java	(.../ExportServlet.java)	(revision 52b858dd710a37035093bd2f9f209e5ad147f33c)
@@ -124,9 +124,6 @@
 				FileDetailsDTO submittedFile = (FileDetailsDTO) fileListIter
 						.next();
 
-				logger.debug("doExport: starting to write file:"
-						+ submittedFile.getFilePath());
-
 				IVersionedNode node = sbmtService.downloadFile(submittedFile
 						.getUuID(), submittedFile.getVersionID());
 				
@@ -143,10 +140,12 @@
 
 						// Creating the directory structure
 						outFileDir.mkdirs();
-
-						File outFile = new File(outFileDir, submittedFile
-								.getFilePath());
-
+						
+						logger.debug("doExport: starting to write file in zip compatible format:"
+								+ node.getZipCompatibleFilename());
+						
+						File outFile = new File(outFileDir, node.getZipCompatibleFilename());
+						
 						// writing the data to file
 						FileOutputStream fos = new FileOutputStream(outFile);
 						BufferedOutputStream bos = new BufferedOutputStream(fos);
@@ -178,7 +177,7 @@
 				logger.debug("doExport: encoding exportedURL");
 				
 				String exportedURL = user.getLogin() + "/" + submissionCount
-						+ "/" + submittedFile.getFilePath();
+				+ "/" + node.getZipCompatibleFilename();
 				
 				attachmentList.add(exportedURL);