diff --git a/app/controllers/code_ocean/files_controller.rb b/app/controllers/code_ocean/files_controller.rb
index e38607c2..55d8b369 100644
--- a/app/controllers/code_ocean/files_controller.rb
+++ b/app/controllers/code_ocean/files_controller.rb
@@ -11,7 +11,9 @@ module CodeOcean
     def create
       @file = CodeOcean::File.new(file_params)
       if @file.file_template_id
-        @file.content = FileTemplate.find(@file.file_template_id).content
+        content = FileTemplate.find(@file.file_template_id).content
+        content.sub! '{{file_name}}', @file.name
+        @file.content = content
       end
       authorize!
       create_and_respond(object: @file, path: proc { implement_exercise_path(@file.context.exercise, tab: 2) })