--- a/sat_templates/templates/bulma/merge-request/edit.html	Fri Dec 11 17:30:47 2020 +0100
+++ b/sat_templates/templates/bulma/merge-request/edit.html	Thu Jan 28 18:42:59 2021 +0100
@@ -1,7 +1,7 @@
-{# edit an existing ticket #}
+{# edit an existing merge request #}
 
-{% set category_menu = [('merge-requests', url_tickets_list),
-                        ('merge-request_new', url_tickets_new)] %}
+{% set category_menu = [('merge-requests', url_list_items),
+                        ('merge-request_new', url_list_new)] %}
 {% extends 'base/base.html' %}
 {% import 'input/form.html' as form with context %}
 {% import 'input/field.html' as field with context %}
@@ -14,16 +14,16 @@
         {% trans app_name=C.APP_NAME%}to modify content of the merge request, you'll have to use command line (with jp){% endtrans %}
     </p>
 </div>
-<div class="create single ticket box box--medium">
+<div class="create single list_item box box--medium">
 {% call form.form() %}
-    {{ xmlui.generate(new_ticket_xmlui,
+    {{ xmlui.generate(new_list_item_xmlui,
                       attributes = {'title': {'required': 'required',
                                               'placeholder': _("Short description of your issue/request")},
                                     'body': {'required': 'required',
                                              'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")},
                                     'labels': {'placeholder': _("You can enter one or several labels separated by commas")},
                                     })}}
-    {{ field.submit(_("Modify ticket")) }}
+    {{ field.submit(_("Modify merge request")) }}
 {% endcall %}
 </div>
 {% endblock body %}