commit - 6ba2bea2c0ffc926c79ca53e0a920f8f219e020c
commit + c3022ba5fc09b6badac00b8c123aad9d45c2e039
blob - c926775b2c575890e95f39a41cea7ab7ccd65b74
blob + 2f130ca8f5f07aa7e457fc8cffa91f54ab350e37
--- got/got.c
+++ got/got.c
@@ -4535,7 +4535,7 @@ histedit_save_list(struct got_histedit_list *histedit_
 	struct got_histedit_list_entry *hle;
 	struct got_commit_object *commit = NULL;
 
-	err = got_worktree_get_histedit_list_path(&path, worktree);
+	err = got_worktree_get_histedit_script_path(&path, worktree);
 	if (err)
 		return err;
 
@@ -4892,7 +4892,7 @@ cmd_histedit(int argc, char *argv[])
 			goto done;
 		}
 
-		error = got_worktree_get_histedit_list_path(&path, worktree);
+		error = got_worktree_get_histedit_script_path(&path, worktree);
 		if (error)
 			goto done;
 
blob - 0a7f10b7adad524cb6e14342756f48ff28261a6c
blob + 105bebdfb14c771c8bb51d8ab106cf8540208344
--- include/got_worktree.h
+++ include/got_worktree.h
@@ -369,6 +369,6 @@ const struct got_error *got_worktree_histedit_abort(st
     struct got_fileindex *, struct got_repository *, struct got_reference *,
     struct got_object_id *, got_worktree_checkout_cb, void *);
 
-/* Get the path to this work tree's histedit command list file. */
-const struct got_error *got_worktree_get_histedit_list_path(char **,
+/* Get the path to this work tree's histedit script file. */
+const struct got_error *got_worktree_get_histedit_script_path(char **,
     struct got_worktree *);
blob - 2a0626057ea68d7928c4de3678836630f02cca24
blob + f7db624a62986cd2410180c91f9ad5c7bccb6962
--- lib/got_lib_worktree.h
+++ lib/got_lib_worktree.h
@@ -57,7 +57,7 @@ struct got_commitable {
 #define GOT_WORKTREE_LOCK		"lock"
 #define GOT_WORKTREE_FORMAT		"format"
 #define GOT_WORKTREE_UUID		"uuid"
-#define GOT_WORKTREE_HISTEDIT_LIST	"histedit-list"
+#define GOT_WORKTREE_HISTEDIT_SCRIPT	"histedit-script"
 
 #define GOT_WORKTREE_FORMAT_VERSION	1
 #define GOT_WORKTREE_INVALID_COMMIT_ID	GOT_SHA1_STRING_ZERO
blob - 4f7c0c9163165aa66b3dd1e012f624ba40726cff
blob + 83d8f86ea4a8f8daabf5d1314c75043ffc586117
--- lib/worktree.c
+++ lib/worktree.c
@@ -1465,10 +1465,11 @@ get_histedit_commit_ref_name(char **refname, struct go
 }
 
 const struct got_error *
-got_worktree_get_histedit_list_path(char **path, struct got_worktree *worktree)
+got_worktree_get_histedit_script_path(char **path,
+    struct got_worktree *worktree)
 {
 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
-	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_LIST) == -1) {
+	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
 		*path = NULL;
 		return got_error_from_errno("asprintf");
 	}