diff --git a/src/main/webapp/app/controller/FlashcardExport.js b/src/main/webapp/app/controller/FlashcardExport.js
index 6c323c167876ba1583003920386fca7fe1d96186..c01cd25060452f035e8ba34c9bdce40fdc63ff8f 100644
--- a/src/main/webapp/app/controller/FlashcardExport.js
+++ b/src/main/webapp/app/controller/FlashcardExport.js
@@ -21,13 +21,8 @@ Ext.define("ARSnova.controller.FlashcardExport", {
 
 	suitableTypes: ['flashcard', 'mc', 'abcd', 'yesno', 'freetext'],
 
-	filename: function (format) {
-		var filename = 'flashcards' + this.getActualDate() + '.' + format;
-		return filename;
-	},
-
-	getActualDate: function () {
-		return ARSnova.app.getController('QuestionExport').getActualDate();
+	filename: function () {
+		return 'arsnova-flashcards-' + moment().format('YYYYMMDDHHmm') + '.csv';
 	},
 
 	exportFlashcards: function (controller, format) {
diff --git a/src/main/webapp/app/controller/QuestionExport.js b/src/main/webapp/app/controller/QuestionExport.js
index 2569161b627aa271d0c54823da77df1bd8f630ef..5c1b30994da04a98145b3e70528407598801b7ee 100644
--- a/src/main/webapp/app/controller/QuestionExport.js
+++ b/src/main/webapp/app/controller/QuestionExport.js
@@ -19,9 +19,8 @@
 Ext.define("ARSnova.controller.QuestionExport", {
 	extend: 'Ext.app.Controller',
 
-	filename: function () {
-		var filename = 'lectureQuestions' + this.getActualDate() + '.csv';
-		return filename;
+	filename: function (name) {
+		return 'arsnova-' + name + '-' + moment().format('YYYYMMDDHHmm') + '.csv';
 	},
 
 	exportCsvFile: function (json) {
@@ -39,15 +38,6 @@ Ext.define("ARSnova.controller.QuestionExport", {
 		});
 	},
 
-	getActualDate: function () {
-		var d = new Date();
-		return ('0' + d.getFullYear()).slice(-2) + '-'
-			+ ('0' + (d.getMonth() + 1)).slice(-2) + '-'
-			+ ('0' + d.getDate()).slice(-2) + '-'
-			+ ('0' + d.getHours()).slice(-2) + '-'
-			+ ('0' + d.getMinutes()).slice(-2);
-	},
-
 	getOption: function (answer, type) {
 		if (answer && type !== 'yesno') {
 			return	answer.text;
@@ -154,7 +144,7 @@ Ext.define("ARSnova.controller.QuestionExport", {
 		if (excel) {
 			csv = 'sep=' + delimiter + '\r\n' + csv;
 		}
-		this.saveFileOnFileSystem(csv, this.filename());
+		this.saveFileOnFileSystem(csv, this.filename("contents"));
 	},
 
 	downloadQuestionAnswers: function (questionObj, answers, delimiter, excel) {
@@ -185,6 +175,6 @@ Ext.define("ARSnova.controller.QuestionExport", {
 		if (excel) {
 			csv = 'sep=' + delimiter + '\r\n' + csv;
 		}
-		this.saveFileOnFileSystem(csv, "answer-stats-" + this.getActualDate() + ".csv");
+		this.saveFileOnFileSystem(csv, this.filename(questionObj.questionType === 'freetext' ? 'textanswers' : 'answerstats'));
 	}
 });
diff --git a/src/main/webapp/app/controller/SessionExport.js b/src/main/webapp/app/controller/SessionExport.js
index ad36fa71a6e6ecf75fcea8713fb53d8b92ea5560..513998d4e2b2f7ef4bd02ade0489a890c05bf5ed 100644
--- a/src/main/webapp/app/controller/SessionExport.js
+++ b/src/main/webapp/app/controller/SessionExport.js
@@ -85,16 +85,9 @@ Ext.define("ARSnova.controller.SessionExport", {
 
 	writeExportDataToFile: function (exportData) {
 		var jsonData = JSON.stringify({exportData: exportData});
-		var dateString = "";
-		var d = new Date();
+		var dateTimeString = moment().format('YYYYMMDDHHmm');
 
-		dateString = ('0' + d.getFullYear()).slice(-2) + '-'
-			+ ('0' + (d.getMonth() + 1)).slice(-2) + '-'
-			+ ('0' + d.getDate()).slice(-2) + '-'
-			+ ('0' + d.getHours()).slice(-2) + '-'
-			+ ('0' + d.getMinutes()).slice(-2);
-
-		var filename = exportData.session.name + dateString + ".json";
+		var filename = 'arsnova-session-' + exportData.session.shortName + '-' + dateTimeString + ".json";
 		this.saveFileOnFileSystem(jsonData, filename);
 
 		return jsonData;