thodg/got

diff --git a/lib/got_lib_worktree.h b/lib/got_lib_worktree.h
index 75906a3..6eb1b51 100644
--- a/lib/got_lib_worktree.h
+++ b/lib/got_lib_worktree.h
@@ -35,11 +35,11 @@ struct got_worktree {
 };
 
 #define GOT_WORKTREE_GOT_DIR		".got"
-#define GOT_WORKTREE_FILE_INDEX		"fileindex"
+#define GOT_WORKTREE_FILE_INDEX		"file-index"
 #define GOT_WORKTREE_REPOSITORY		"repository"
 #define GOT_WORKTREE_PATH_PREFIX	"path-prefix"
-#define GOT_WORKTREE_HEAD		"head"
-#define GOT_WORKTREE_BASE		"base"
+#define GOT_WORKTREE_HEAD_REF		"head-ref"
+#define GOT_WORKTREE_BASE_COMMIT	"base-commit"
 #define GOT_WORKTREE_LOCK		"lock"
 #define GOT_WORKTREE_FORMAT		"format"
 
diff --git a/lib/worktree.c b/lib/worktree.c
index 673aed2..091974e 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -210,7 +210,7 @@ got_worktree_init(const char *path, struct got_reference *head_ref,
 		err = got_error_from_errno();
 		goto done;
 	}
-	err = create_meta_file(path_got, GOT_WORKTREE_HEAD, refstr);
+	err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
 	if (err)
 		goto done;
 
@@ -218,7 +218,7 @@ got_worktree_init(const char *path, struct got_reference *head_ref,
 	err = got_object_id_str(&basestr, commit_id);
 	if (err)
 		goto done;
-	err = create_meta_file(path_got, GOT_WORKTREE_BASE, basestr);
+	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
 	if (err)
 		goto done;
 
@@ -324,12 +324,13 @@ got_worktree_open(struct got_worktree **worktree, const char *path)
 	if (err)
 		goto done;
 
-	err = read_meta_file(&(*worktree)->base, path_got, GOT_WORKTREE_BASE);
+	err = read_meta_file(&(*worktree)->base, path_got,
+	    GOT_WORKTREE_BASE_COMMIT);
 	if (err)
 		goto done;
 
 	err = read_meta_file(&(*worktree)->head_ref, path_got,
-	    GOT_WORKTREE_HEAD);
+	    GOT_WORKTREE_HEAD_REF);
 	if (err)
 		goto done;
 
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index 476ab3d..9740973 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -84,9 +84,9 @@ remove_meta_file(const char *worktree_path, const char *name)
 static int
 remove_worktree(const char *worktree_path)
 {
-	if (!remove_meta_file(worktree_path, GOT_WORKTREE_HEAD))
+	if (!remove_meta_file(worktree_path, GOT_WORKTREE_HEAD_REF))
 		return 0;
-	if (!remove_meta_file(worktree_path, GOT_WORKTREE_BASE))
+	if (!remove_meta_file(worktree_path, GOT_WORKTREE_BASE_COMMIT))
 		return 0;
 	if (!remove_meta_file(worktree_path, GOT_WORKTREE_FILE_INDEX))
 		return 0;
@@ -172,9 +172,9 @@ worktree_init(const char *repo_path)
 		goto done;
 
 	/* Ensure required files were created. */
-	if (!check_meta_file_exists(worktree_path, GOT_WORKTREE_HEAD))
+	if (!check_meta_file_exists(worktree_path, GOT_WORKTREE_HEAD_REF))
 		goto done;
-	if (!check_meta_file_exists(worktree_path, GOT_WORKTREE_BASE))
+	if (!check_meta_file_exists(worktree_path, GOT_WORKTREE_BASE_COMMIT))
 		goto done;
 	if (!check_meta_file_exists(worktree_path, GOT_WORKTREE_LOCK))
 		goto done;
@@ -274,10 +274,10 @@ worktree_init_exists(const char *repo_path)
 
 	/* Create files which got_worktree_init() will try to create as well. */
 	if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
-	    GOT_WORKTREE_HEAD))
+	    GOT_WORKTREE_HEAD_REF))
 		goto done;
 	if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
-	    GOT_WORKTREE_BASE))
+	    GOT_WORKTREE_BASE_COMMIT))
 		goto done;
 	if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
 	    GOT_WORKTREE_LOCK))