diff --git a/app/models/authorization_request_form.rb b/app/models/authorization_request_form.rb
index 3e4905000..4f630a9bf 100644
--- a/app/models/authorization_request_form.rb
+++ b/app/models/authorization_request_form.rb
@@ -69,7 +69,7 @@ def link
   def introduction
     return nil if @introduction.blank?
 
-    format(@introduction, service_provider_name: service_provider.try(:name), form_name: name)
+    format(@introduction, editor_name: service_provider.try(:name), form_name: name)
   end
 
   def authorization_definition
diff --git a/app/views/authorization_request_forms/_authorization_request_form_card.html.erb b/app/views/authorization_request_forms/_authorization_request_form_card.html.erb
index fc00a67fe..1e6fff912 100644
--- a/app/views/authorization_request_forms/_authorization_request_form_card.html.erb
+++ b/app/views/authorization_request_forms/_authorization_request_form_card.html.erb
@@ -13,11 +13,11 @@
       <p class="fr-tile__detail">
         <%= authorization_request_form.description %>
       </p>
-      <% if authorization_request_form.editor %>
+      <% if authorization_request_form.service_provider %>
         <div class="fr-tile__start">
           <p class="fr-badge fr-badge--sm">
             Via l'éditeur
-            <%= authorization_request_form.editor.name %>
+            <%= authorization_request_form.service_provider.name %>
           </p>
         </div>
       <% end %>
diff --git a/app/views/authorization_request_forms/api_particulier_through_editor_without_contact_technique.html.erb b/app/views/authorization_request_forms/api_particulier_through_editor_without_contact_technique.html.erb
index d71b5de94..318710e3d 100644
--- a/app/views/authorization_request_forms/api_particulier_through_editor_without_contact_technique.html.erb
+++ b/app/views/authorization_request_forms/api_particulier_through_editor_without_contact_technique.html.erb
@@ -1,6 +1,7 @@
 <%= authorization_request_form(@authorization_request) do |f| %>
   <p class="fr-alert fr-alert--info fr-my-3w">
-    Ce formulaire simplifié vous permet d'obtenir une habilitation pour un logiciel pré-configuré de l'éditeur <%= @authorization_request.form.editor.name %>. Une partie des informations
+    Ce formulaire simplifié vous permet d'obtenir une habilitation pour un logiciel pré-configuré de
+    l'éditeur <%= @authorization_request.form.service_provider.name %>. Une partie des informations
     contractuelles sont fixes et ne peuvent être modifiées. Celles-ci vous seront résumées à la prochaine étape, et ne nécessitent aucune intervention de votre part.
   </p>
 
diff --git a/features/step_definitions/authorization_requests_steps.rb b/features/step_definitions/authorization_requests_steps.rb
index 74ca626c0..bcd3d5357 100644
--- a/features/step_definitions/authorization_requests_steps.rb
+++ b/features/step_definitions/authorization_requests_steps.rb
@@ -50,7 +50,7 @@
     name: authorization_request_form_name,
     authorization_request_class: find_authorization_request_class_from_name(authorization_request_name),
   ).select do |form|
-    form.editor.name == editor_name
+    form.service_provider.name == editor_name
   end
 
   raise "More than one form found for #{authorization_request_name}, #{authorization_request_form_name} and #{editor_name}" if authorization_request_forms.count > 1