@@ 570,7 570,7 @@ def extract_fields(text, template, templ
     return new_fields
 
 
-def edit_form(ui, repo, fields, template_name):
+def edit_form(ui, repo, fields, template_name, backup_name=b"last_bzexport.txt"):
     template = templates[template_name]
 
     # orig_text is the template filled with the current field values.

          
@@ 580,7 580,7 @@ def edit_form(ui, repo, fields, template
     # Allow user to edit the form
     new_text = edit(ui, orig_text.encode('utf-8'))
 
-    saved = savefile(repo, b"last_bzexport.txt", new_text)
+    saved = savefile(repo, backup_name, new_text)
     ui.write(b"saved edited form in %s\n" % saved)
 
     # Old field values are passed in for their type (list vs scalar).

          
@@ 593,7 593,8 @@ def edit_form(ui, repo, fields, template
     return new_fields
 
 
-def multi_edit_form(ui, repo, common_fields, multi_fields, template_name):
+def multi_edit_form(ui, repo, common_fields, multi_fields, template_name,
+                    backup_name=b"last_bzexport.txt"):
     template = templates[template_name]
 
     if len(multi_fields) == 0:

          
@@ 618,7 619,7 @@ def multi_edit_form(ui, repo, common_fie
     orig_text = header + "\n".join(forms)
 
     new_text = edit(ui, orig_text.encode('utf-8'))
-    saved = savefile(repo, b"last_bzexport.txt", new_text)
+    saved = savefile(repo, backup_name, new_text)
     ui.write(b"saved edited form in %s\n" % saved)
 
     new_field_sets = []

          
@@ 1689,7 1690,7 @@ def _bzexport_moz_phab(ui, repo, opts, r
         if opts['new']:
             values = edit_form(ui, repo, values, 'new_bug_template')
         else:
-            values = edit_form(ui, repo, values, 'phab_update_template')
+            values = edit_form(ui, repo, values, 'phab_update_template', b"phab_update.txt")
 
     values = fill_values(values, ui, repo, api_server,
                          finalize=True, patchdata=contents)

          
@@ 1820,7 1821,7 @@ def _bzexport_phabsend(ui, repo, opts, r
                 multi_values[i]['ATTACHCOMMENT'] = '<none>' if i else opts['comment']
 
         value_sets = multi_edit_form(ui, repo, values, multi_values,
-                                     'phab_update_template')
+                                     'phab_update_template', b"phab_update.txt")
     else:
         value_sets = multi_values
         value_sets[0].update(values)