20 files changed, 57 insertions, 57 deletions

diff --git a/tests/attr/repo.c b/tests/attr/repo.c
index f9ba585fb..49cccdc5a 100644
--- a/tests/attr/repo.c
+++ b/tests/attr/repo.c
@@ -293,7 +293,7 @@ static void assert_proper_normalization(git_index *index, const char *filename,
 	cl_assert(!git_index_find(&index_pos, index, filename));
 
 	entry = git_index_get_byindex(index, index_pos);
-	cl_assert_equal_i(0, git_oid_streq(&entry->oid, expected_sha));
+	cl_assert_equal_i(0, git_oid_streq(&entry->id, expected_sha));
 }
 
 void test_attr_repo__staging_properly_normalizes_line_endings_according_to_gitattributes_directives(void)
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c
index 66965a89b..a8b93b28d 100644
--- a/tests/checkout/conflict.c
+++ b/tests/checkout/conflict.c
@@ -96,7 +96,7 @@ static void create_index(struct checkout_index_entry *entries, size_t entries_le
 
 		entry.mode = entries[i].mode;
 		entry.flags = entries[i].stage << GIT_IDXENTRY_STAGESHIFT;
-		git_oid_fromstr(&entry.oid, entries[i].oid_str);
+		git_oid_fromstr(&entry.id, entries[i].oid_str);
 		entry.path = entries[i].path;
 
 		cl_git_pass(git_index_add(g_index, &entry));
diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c
index 9a4cbd313..cba79432f 100644
--- a/tests/checkout/crlf.c
+++ b/tests/checkout/crlf.c
@@ -174,13 +174,13 @@ void test_checkout_crlf__with_ident(void)
 	/* check that blobs have $Id$ */
 
 	cl_git_pass(git_blob_lookup(&blob, g_repo,
-		& git_index_get_bypath(index, "lf.ident", 0)->oid));
+		& git_index_get_bypath(index, "lf.ident", 0)->id));
 	cl_assert_equal_s(
 		ALL_LF_TEXT_RAW "\n$Id$\n", git_blob_rawcontent(blob));
 	git_blob_free(blob);
 
 	cl_git_pass(git_blob_lookup(&blob, g_repo,
-		& git_index_get_bypath(index, "more2.identcrlf", 0)->oid));
+		& git_index_get_bypath(index, "more2.identcrlf", 0)->id));
 	cl_assert_equal_s(
 		"\n$Id$\n" MORE_CRLF_TEXT_AS_LF, git_blob_rawcontent(blob));
 	git_blob_free(blob);
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
index 047c9ed98..3c731c5ae 100644
--- a/tests/checkout/tree.c
+++ b/tests/checkout/tree.c
@@ -892,16 +892,16 @@ static void create_conflict(void)
 	memset(&entry, 0x0, sizeof(git_index_entry));
 	entry.mode = 0100644;
 	entry.flags = 1 << GIT_IDXENTRY_STAGESHIFT;
-	git_oid_fromstr(&entry.oid, "d427e0b2e138501a3d15cc376077a3631e15bd46");
+	git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46");
 	entry.path = "conflicts.txt";
 	cl_git_pass(git_index_add(index, &entry));
 
 	entry.flags = 2 << GIT_IDXENTRY_STAGESHIFT;
-	git_oid_fromstr(&entry.oid, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf");
+	git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf");
 	cl_git_pass(git_index_add(index, &entry));
 
 	entry.flags = 3 << GIT_IDXENTRY_STAGESHIFT;
-	git_oid_fromstr(&entry.oid, "2bd0a343aeef7a2cf0d158478966a6e587ff3863");
+	git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863");
 	cl_git_pass(git_index_add(index, &entry));
 
 	git_index_write(index);
diff --git a/tests/diff/iterator.c b/tests/diff/iterator.c
index bbdae8ad1..92e6f723b 100644
--- a/tests/diff/iterator.c
+++ b/tests/diff/iterator.c
@@ -377,7 +377,7 @@ static void index_iterator_test(
 		if (expected_oids != NULL) {
 			git_oid oid;
 			cl_git_pass(git_oid_fromstr(&oid, expected_oids[count]));
-			cl_assert_equal_i(git_oid_cmp(&oid, &entry->oid), 0);
+			cl_assert_equal_i(git_oid_cmp(&oid, &entry->id), 0);
 		}
 
 		count++;
diff --git a/tests/filter/custom.c b/tests/filter/custom.c
index a81885c28..70524010e 100644
--- a/tests/filter/custom.c
+++ b/tests/filter/custom.c
@@ -299,7 +299,7 @@ void test_filter_custom__order_dependency(void)
 	git_index_free(index);
 
 	cl_git_pass(git_blob_lookup(&blob, g_repo,
-		& git_index_get_bypath(index, "hero.1.rev-ident", 0)->oid));
+		& git_index_get_bypath(index, "hero.1.rev-ident", 0)->id));
 	cl_assert_equal_s(
 		"\n!nuf evaH\n$dI$\ntset a si sihT", git_blob_rawcontent(blob));
 	cl_git_pass(git_blob_filtered_content(&buf, blob, "hero.1.rev-ident", 0));
@@ -310,7 +310,7 @@ void test_filter_custom__order_dependency(void)
 	git_blob_free(blob);
 
 	cl_git_pass(git_blob_lookup(&blob, g_repo,
-		& git_index_get_bypath(index, "hero.2.rev-ident", 0)->oid));
+		& git_index_get_bypath(index, "hero.2.rev-ident", 0)->id));
 	cl_assert_equal_s(
 		"\n!yzarC\n$Id$\ntset rehtonA", git_blob_rawcontent(blob));
 	cl_git_pass(git_blob_filtered_content(&buf, blob, "hero.2.rev-ident", 0));
diff --git a/tests/index/conflicts.c b/tests/index/conflicts.c
index 6311b3a75..90aaa442d 100644
--- a/tests/index/conflicts.c
+++ b/tests/index/conflicts.c
@@ -47,15 +47,15 @@ void test_index_conflicts__add(void)
 
 	ancestor_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&ancestor_entry.oid, TEST_ANCESTOR_OID);
+	git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID);
 
 	our_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&our_entry.oid, TEST_OUR_OID);
+	git_oid_fromstr(&our_entry.id, TEST_OUR_OID);
 
 	their_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&their_entry.oid, TEST_THEIR_OID);
+	git_oid_fromstr(&their_entry.id, TEST_THEIR_OID);
 
 	cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
 
@@ -75,15 +75,15 @@ void test_index_conflicts__add_fixes_incorrect_stage(void)
 
 	ancestor_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&ancestor_entry.oid, TEST_ANCESTOR_OID);
+	git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID);
 
 	our_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&our_entry.oid, TEST_OUR_OID);
+	git_oid_fromstr(&our_entry.id, TEST_OUR_OID);
 
 	their_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&their_entry.oid, TEST_THEIR_OID);
+	git_oid_fromstr(&their_entry.id, TEST_THEIR_OID);
 
 	cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
 
@@ -107,13 +107,13 @@ void test_index_conflicts__get(void)
 	cl_assert_equal_s("conflicts-one.txt", conflict_entry[0]->path);
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[0]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[0]->id, &oid) == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_OUR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[1]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[1]->id, &oid) == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_THEIR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[2]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[2]->id, &oid) == 0);
 
 	cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1],
 		&conflict_entry[2], repo_index, "conflicts-two.txt"));
@@ -121,13 +121,13 @@ void test_index_conflicts__get(void)
 	cl_assert_equal_s("conflicts-two.txt", conflict_entry[0]->path);
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[0]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[0]->id, &oid) == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[1]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[1]->id, &oid) == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[2]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[2]->id, &oid) == 0);
 }
 
 void test_index_conflicts__iterate(void)
@@ -141,29 +141,29 @@ void test_index_conflicts__iterate(void)
 	cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator));
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[0]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[0]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_OUR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[1]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[1]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_ONE_THEIR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[2]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[2]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0);
 
 	cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator));
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[0]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[0]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[1]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[1]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0);
 
 	git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID);
-	cl_assert(git_oid_cmp(&conflict_entry[2]->oid, &oid) == 0);
+	cl_assert(git_oid_cmp(&conflict_entry[2]->id, &oid) == 0);
 	cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0);
 
 	cl_assert(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator) == GIT_ITEROVER);
@@ -273,7 +273,7 @@ void test_index_conflicts__partial(void)
 
 	ancestor_entry.path = "test-one.txt";
 	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&ancestor_entry.oid, TEST_ANCESTOR_OID);
+	git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID);
 
 	cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, NULL, NULL));
 	cl_assert(git_index_entrycount(repo_index) == 9);
@@ -281,7 +281,7 @@ void test_index_conflicts__partial(void)
 	cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1],
 		&conflict_entry[2], repo_index, "test-one.txt"));
 
-	cl_assert(git_oid_cmp(&ancestor_entry.oid, &conflict_entry[0]->oid) == 0);
+	cl_assert(git_oid_cmp(&ancestor_entry.id, &conflict_entry[0]->id) == 0);
 	cl_assert(conflict_entry[1] == NULL);
 	cl_assert(conflict_entry[2] == NULL);
 }
diff --git a/tests/index/rename.c b/tests/index/rename.c
index 4deef1332..b6fb61d10 100644
--- a/tests/index/rename.c
+++ b/tests/index/rename.c
@@ -27,7 +27,7 @@ void test_index_rename__single_file(void)
 	cl_assert(!git_index_find(&position, index, "lame.name.txt"));
 
 	entry = git_index_get_byindex(index, position);
-	cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
+	cl_assert(git_oid_cmp(&expected, &entry->id) == 0);
 
 	/* This removes the entry from the index, but not from the object database */
 	cl_git_pass(git_index_remove(index, "lame.name.txt", 0));
@@ -41,7 +41,7 @@ void test_index_rename__single_file(void)
 	cl_assert(!git_index_find(&position, index, "fancy.name.txt"));
 
 	entry = git_index_get_byindex(index, position);
-	cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
+	cl_assert(git_oid_cmp(&expected, &entry->id) == 0);
 
 	git_index_free(index);
 	git_repository_free(repo);
diff --git a/tests/index/tests.c b/tests/index/tests.c
index 5a05bd8a9..bd90bc557 100644
--- a/tests/index/tests.c
+++ b/tests/index/tests.c
@@ -243,11 +243,11 @@ void test_index_tests__add(void)
 	entry = git_index_get_byindex(index, 0);
 
 	/* And the built-in hashing mechanism worked as expected */
-	cl_assert(git_oid_cmp(&id1, &entry->oid) == 0);
+	cl_assert(git_oid_cmp(&id1, &entry->id) == 0);
 
 	/* Test access by path instead of index */
 	cl_assert((entry = git_index_get_bypath(index, "test.txt", 0)) != NULL);
-	cl_assert(git_oid_cmp(&id1, &entry->oid) == 0);
+	cl_assert(git_oid_cmp(&id1, &entry->id) == 0);
 
 	git_index_free(index);
 	git_repository_free(repo);
@@ -283,14 +283,14 @@ void test_index_tests__add_issue_1397(void)
 
 	/* Make sure the initial SHA-1 is correct */
 	cl_assert((entry = git_index_get_bypath(index, "crlf_file.txt", 0)) != NULL);
-	cl_assert_(git_oid_cmp(&id1, &entry->oid) == 0, "first oid check");
+	cl_assert_(git_oid_cmp(&id1, &entry->id) == 0, "first oid check");
 
 	/* Update the index */
 	cl_git_pass(git_index_add_bypath(index, "crlf_file.txt"));
 
 	/* Check the new SHA-1 */
 	cl_assert((entry = git_index_get_bypath(index, "crlf_file.txt", 0)) != NULL);
-	cl_assert_(git_oid_cmp(&id1, &entry->oid) == 0, "second oid check");
+	cl_assert_(git_oid_cmp(&id1, &entry->id) == 0, "second oid check");
 
 	git_index_free(index);
 }
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c
index 7ce5e28ff..8d6ef2dbe 100644
--- a/tests/merge/merge_helpers.c
+++ b/tests/merge/merge_helpers.c
@@ -112,7 +112,7 @@ void merge__dump_index_entries(git_vector *index_entries)
 		index_entry = index_entries->contents[i];
 
 		printf("%o ", index_entry->mode);
-		printf("%s ", git_oid_allocfmt(&index_entry->oid));
+		printf("%s ", git_oid_allocfmt(&index_entry->id));
 		printf("%d ", git_index_entry_stage(index_entry));
 		printf("%s ", index_entry->path);
 		printf("\n");
@@ -166,7 +166,7 @@ static int index_entry_eq_merge_index_entry(const struct merge_index_entry *expe
 		test_oid = 0;
 
 	if (actual->mode != expected->mode ||
-		(test_oid && git_oid_cmp(&actual->oid, &expected_oid) != 0) ||
+		(test_oid && git_oid_cmp(&actual->id, &expected_oid) != 0) ||
 		git_index_entry_stage(actual) != expected->stage)
 		return 0;
 
diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c
index ebc6e271d..bd710e6d8 100644
--- a/tests/merge/trees/automerge.c
+++ b/tests/merge/trees/automerge.c
@@ -121,7 +121,7 @@ void test_merge_trees_automerge__automerge(void)
 	cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
 	cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
 
-	cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->oid, GIT_OBJ_BLOB));
+	cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB));
 	cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
 
 	git_index_free(index);
diff --git a/tests/merge/trees/commits.c b/tests/merge/trees/commits.c
index f8f4fbacb..eeb30dae5 100644
--- a/tests/merge/trees/commits.c
+++ b/tests/merge/trees/commits.c
@@ -72,7 +72,7 @@ void test_merge_trees_commits__automerge(void)
 	cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
 	cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
 
-	cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->oid, GIT_OBJ_BLOB));
+	cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB));
 	cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
 
 	git_index_free(index);
diff --git a/tests/merge/trees/trivial.c b/tests/merge/trees/trivial.c
index 2de187bf4..377b24742 100644
--- a/tests/merge/trees/trivial.c
+++ b/tests/merge/trees/trivial.c
@@ -259,7 +259,7 @@ void test_merge_trees_trivial__13(void)
 
 	cl_assert(entry = git_index_get_bypath(result, "modified-in-13.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b"));
-	cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0);
+	cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0);
 
 	cl_assert(git_index_reuc_entrycount(result) == 0);
 	cl_assert(merge_trivial_conflict_entrycount(result) == 0);
@@ -278,7 +278,7 @@ void test_merge_trees_trivial__14(void)
 
 	cl_assert(entry = git_index_get_bypath(result, "modified-in-14-branch.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9"));
-	cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0);
+	cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0);
 
 	cl_assert(git_index_reuc_entrycount(result) == 0);
 	cl_assert(merge_trivial_conflict_entrycount(result) == 0);
diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c
index 6b152cc4d..266719e2a 100644
--- a/tests/merge/workdir/simple.c
+++ b/tests/merge/workdir/simple.c
@@ -696,7 +696,7 @@ void test_merge_workdir_simple__binary(void)
 	cl_assert((binary_entry = git_index_get_bypath(repo_index, "binary", 0)) != NULL);
 
 	cl_git_pass(git_oid_fromstr(&our_file_oid, "23ed141a6ae1e798b2f721afedbe947c119111ba"));
-	cl_assert(git_oid_cmp(&binary_entry->oid, &our_file_oid) == 0);
+	cl_assert(git_oid_cmp(&binary_entry->id, &our_file_oid) == 0);
 
 	git_merge_head_free(their_head);
 	git_merge_result_free(result);
diff --git a/tests/merge/workdir/trivial.c b/tests/merge/workdir/trivial.c
index 71437d48e..a6bbbf095 100644
--- a/tests/merge/workdir/trivial.c
+++ b/tests/merge/workdir/trivial.c
@@ -226,7 +226,7 @@ void test_merge_workdir_trivial__13(void)
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-13.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b"));
-	cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0);
+	cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0);
 
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
 	cl_assert(merge_trivial_conflict_entrycount() == 0);
@@ -242,7 +242,7 @@ void test_merge_workdir_trivial__14(void)
 
 	cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-14-branch.txt", 0));
 	cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9"));
-	cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0);
+	cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0);
 
 	cl_assert(git_index_reuc_entrycount(repo_index) == 0);
 	cl_assert(merge_trivial_conflict_entrycount() == 0);
diff --git a/tests/object/commit/commitstagedfile.c b/tests/object/commit/commitstagedfile.c
index 9867ab418..05a0d1605 100644
--- a/tests/object/commit/commitstagedfile.c
+++ b/tests/object/commit/commitstagedfile.c
@@ -77,7 +77,7 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void)
 
 	entry = git_index_get_byindex(index, 0);
 
-	cl_assert(git_oid_cmp(&expected_blob_oid, &entry->oid) == 0);
+	cl_assert(git_oid_cmp(&expected_blob_oid, &entry->id) == 0);
 
 	/*
 	 * Information about index entry should match test file
diff --git a/tests/object/tree/duplicateentries.c b/tests/object/tree/duplicateentries.c
index 9262f9a1a..1b752acbb 100644
--- a/tests/object/tree/duplicateentries.c
+++ b/tests/object/tree/duplicateentries.c
@@ -127,17 +127,17 @@ static void add_fake_conflicts(git_index *index)
 	ancestor_entry.path = "duplicate";
 	ancestor_entry.mode = GIT_FILEMODE_BLOB;
 	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&ancestor_entry.oid, "a8233120f6ad708f843d861ce2b7228ec4e3dec6");
+	git_oid_fromstr(&ancestor_entry.id, "a8233120f6ad708f843d861ce2b7228ec4e3dec6");
 
 	our_entry.path = "duplicate";
 	our_entry.mode = GIT_FILEMODE_BLOB;
 	ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&our_entry.oid, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057");
+	git_oid_fromstr(&our_entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057");
 
 	their_entry.path = "duplicate";
 	their_entry.mode = GIT_FILEMODE_BLOB;
 	ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
-	git_oid_fromstr(&their_entry.oid, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd");
+	git_oid_fromstr(&their_entry.id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd");
 
 	cl_git_pass(git_index_conflict_add(index, &ancestor_entry, &our_entry, &their_entry));
 }
diff --git a/tests/reset/default.c b/tests/reset/default.c
index e29e63550..57a3f7c51 100644
--- a/tests/reset/default.c
+++ b/tests/reset/default.c
@@ -57,7 +57,7 @@ static void assert_content_in_index(
 			if (!expected_shas)
 				continue;
 
-			cl_git_pass(git_oid_streq(&entry->oid, expected_shas->strings[i]));
+			cl_git_pass(git_oid_streq(&entry->id, expected_shas->strings[i]));
 		} else
 			cl_assert_equal_i(should_exist, error != GIT_ENOTFOUND);
 	}
diff --git a/tests/reset/hard.c b/tests/reset/hard.c
index 1c0c84135..0f80d32df 100644
--- a/tests/reset/hard.c
+++ b/tests/reset/hard.c
@@ -111,7 +111,7 @@ static void index_entry_init(git_index *index, int side, git_oid *oid)
 	entry.path = "conflicting_file";
 	entry.flags = (side << GIT_IDXENTRY_STAGESHIFT);
 	entry.mode = 0100644;
-	git_oid_cpy(&entry.oid, oid);
+	git_oid_cpy(&entry.id, oid);
 
 	cl_git_pass(git_index_add(index, &entry));
 }
diff --git a/tests/status/worktree.c b/tests/status/worktree.c
index fd57fcc1e..def3d60f0 100644
--- a/tests/status/worktree.c
+++ b/tests/status/worktree.c
@@ -455,15 +455,15 @@ void test_status_worktree__conflict_with_diff3(void)
 	memset(&their_entry, 0x0, sizeof(git_index_entry));
 
 	ancestor_entry.path = "modified_file";
-	git_oid_fromstr(&ancestor_entry.oid,
+	git_oid_fromstr(&ancestor_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	our_entry.path = "modified_file";
-	git_oid_fromstr(&our_entry.oid,
+	git_oid_fromstr(&our_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	their_entry.path = "modified_file";
-	git_oid_fromstr(&their_entry.oid,
+	git_oid_fromstr(&their_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	cl_git_pass(git_status_file(&status, repo, "modified_file"));
@@ -605,15 +605,15 @@ void test_status_worktree__conflicted_item(void)
 	memset(&their_entry, 0x0, sizeof(git_index_entry));
 
 	ancestor_entry.path = "modified_file";
-	git_oid_fromstr(&ancestor_entry.oid,
+	git_oid_fromstr(&ancestor_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	our_entry.path = "modified_file";
-	git_oid_fromstr(&our_entry.oid,
+	git_oid_fromstr(&our_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	their_entry.path = "modified_file";
-	git_oid_fromstr(&their_entry.oid,
+	git_oid_fromstr(&their_entry.id,
 		"452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
 
 	cl_git_pass(git_status_file(&status, repo, "modified_file"));