diff --git a/spec/factories/mail_templates.rb b/spec/factories/mail_templates.rb
index 619ca6eea..43f358bdb 100644
--- a/spec/factories/mail_templates.rb
+++ b/spec/factories/mail_templates.rb
@@ -1,13 +1,15 @@
 FactoryGirl.define do
-  factory :mail_template, class: Mails::ClosedMail do
+  factory :closed_mail, class: Mails::ClosedMail do
     subject "Subject, voila voila"
     body "Blabla ceci est mon body"
 
-    factory :dossier_submitted_mail_template, class: Mails::ReceivedMail
+    factory :received_mail, class: Mails::ReceivedMail
 
-    factory :dossier_refused_mail_template, class: Mails::RefusedMail
+    factory :refused_mail, class: Mails::RefusedMail
 
-    factory :dossier_en_instruction_mail_template, class: Mails::InitiatedMail do
+    factory :without_continuation_mail, class: Mails::WithoutContinuationMail
+
+    factory :initiated_mail, class: Mails::InitiatedMail do
       subject "[TPS] Accusé de réception pour votre dossier nº --numéro du dossier--"
       body "Votre administration vous confirme la bonne réception de votre dossier nº --numéro du dossier--"
     end
diff --git a/spec/factories/received_mail.rb b/spec/factories/received_mail.rb
deleted file mode 100644
index 4a001bde9..000000000
--- a/spec/factories/received_mail.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-FactoryGirl.define do
-  factory :received_mail, class: Mails::ReceivedMail do
-    subject "Mail d'accusé de bonne reception de votre dossier"
-    body "Votre dossier est correctement reçu"
-  end
-end
diff --git a/spec/views/admin/mail_templates/edit.html.haml_spec.rb b/spec/views/admin/mail_templates/edit.html.haml_spec.rb
index 90e7d12f5..f41f6087b 100644
--- a/spec/views/admin/mail_templates/edit.html.haml_spec.rb
+++ b/spec/views/admin/mail_templates/edit.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'admin/mail_templates/edit.html.haml', type: :view do
   let(:procedure) { create(:procedure) }
-  let(:mail_template) { create(:mail_template, procedure: procedure) }
+  let(:mail_template) { create(:received_mail, procedure: procedure) }
   let(:all_tags) { mail_template.tags }
 
   before do