diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/getCustomTemplate/getCustomTemplate_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/getCustomTemplate/getCustomTemplate_response_embed_en_US.ftl
index c8dc4e01..abc3dfdb 100644
--- a/abstracto-modules/core/src/main/resources/en_US/commands/getCustomTemplate/getCustomTemplate_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/getCustomTemplate/getCustomTemplate_response_embed_en_US.ftl
@@ -3,7 +3,8 @@
     "additionalMessage": "<@safe_include "getCustomTemplate_response_embed_text"/>",
     "files": [
         {
-            "fileName": "${templateKey}.ftl"
+            "fileName": "${templateKey}.ftl",
+            "fileContent": "${templateContent?json_string}"
         }
     ]
 }
\ No newline at end of file
diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/getTemplate/getTemplate_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/getTemplate/getTemplate_response_embed_en_US.ftl
index d1eb80c4..5fd7fc4d 100644
--- a/abstracto-modules/core/src/main/resources/en_US/commands/getTemplate/getTemplate_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/getTemplate/getTemplate_response_embed_en_US.ftl
@@ -3,7 +3,8 @@
     "additionalMessage": "<@safe_include "getTemplate_response_embed_text"/>",
     "files": [
         {
-            "fileName": "${templateKey}.ftl"
+            "fileName": "${templateKey}.ftl",
+            "fileContent": "${templateContent?json_string}"
         }
     ]
 }
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_file_name_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_file_name_en_US.ftl
index e287b4fd..647592d6 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_file_name_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_file_name_en_US.ftl
@@ -1 +1 @@
-emote_stats_${guild.id}.csv
\ No newline at end of file
+emote_stats_${serverId}.csv
\ No newline at end of file
diff --git a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl
index a4962a10..c4680916 100644
--- a/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl
+++ b/abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl
@@ -7,7 +7,8 @@
     "additionalMessage": "<@safe_include "downloadEmoteStats_response_embed_text"/>",
     "files": [
         {
-            "fileName": "${serverId}-emotestats.csv"
+            "fileName": "<@safe_include "downloadEmoteStats_file_name"/>",
+            "fileContent": "<@safe_include "downloadEmoteStats_file_content"/>"
         }
     ]
 }
\ No newline at end of file