diff -r 8caf438577f0 modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Tue Dec 20 19:31:42 2016 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Fri Dec 23 20:04:16 2016 +0530
@@ -331,12 +331,14 @@
         Map<String, String> parameters, Entity entity) {
       try {
         OBContext.setAdminMode();
-        response.setHeader("Content-Disposition", "attachment; filename=ExportedData.csv");
+        Tab tab1 = JsonUtils.isValueEmpty(parameters.get(JsonConstants.TAB_PARAMETER)) ? null
+            : OBDal.getInstance().get(Tab.class, parameters.get(JsonConstants.TAB_PARAMETER));
+        Window window = tab1.getWindow();
+        String filename = window.getName().trim().replace(" ", "") + "_"
+            + tab1.getName().trim().replace(" ", "") + ".csv";
+        response.setHeader("Content-Disposition", "attachment; filename=" + filename);
         writer = response.getWriter();
         VariablesSecureApp vars = new VariablesSecureApp(request);
-        Window window = JsonUtils.isValueEmpty(parameters.get(JsonConstants.TAB_PARAMETER)) ? null
-            : OBDal.getInstance().get(Tab.class, parameters.get(JsonConstants.TAB_PARAMETER))
-                .getWindow();
         try {
           prefDecimalSeparator = Preferences.getPreferenceValue("OBSERDS_CSVDecimalSeparator",
               true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()