oid: `GIT_OID_*SZ` is now `GIT_OID_SHA1_*SIZE`

In preparation for SHA256 support, `GIT_OID_RAWSZ` and `GIT_OID_HEXSZ`
need to indicate that they're the size of _SHA1_ OIDs.

81 files changed, 355 insertions, 355 deletions

diff --git a/examples/cat-file.c b/examples/cat-file.c
index b81e9a8da..741edb484 100644
--- a/examples/cat-file.c
+++ b/examples/cat-file.c
@@ -49,7 +49,7 @@ static void show_blob(const git_blob *blob)
 static void show_tree(const git_tree *tree)
 {
 	size_t i, max_i = (int)git_tree_entrycount(tree);
-	char oidstr[GIT_OID_HEXSZ + 1];
+	char oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 	const git_tree_entry *te;
 
 	for (i = 0; i < max_i; ++i) {
@@ -70,7 +70,7 @@ static void show_tree(const git_tree *tree)
 static void show_commit(const git_commit *commit)
 {
 	unsigned int i, max_i;
-	char oidstr[GIT_OID_HEXSZ + 1];
+	char oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(oidstr, sizeof(oidstr), git_commit_tree_id(commit));
 	printf("tree %s\n", oidstr);
@@ -90,7 +90,7 @@ static void show_commit(const git_commit *commit)
 
 static void show_tag(const git_tag *tag)
 {
-	char oidstr[GIT_OID_HEXSZ + 1];
+	char oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(oidstr, sizeof(oidstr), git_tag_target_id(tag));;
 	printf("object %s\n", oidstr);
@@ -125,7 +125,7 @@ int lg2_cat_file(git_repository *repo, int argc, char *argv[])
 {
 	struct catfile_options o = { ".", NULL, 0, 0 };
 	git_object *obj = NULL;
-	char oidstr[GIT_OID_HEXSZ + 1];
+	char oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	parse_opts(&o, argc, argv);
 
@@ -133,7 +133,7 @@ int lg2_cat_file(git_repository *repo, int argc, char *argv[])
 			"Could not resolve", o.rev);
 
 	if (o.verbose) {
-		char oidstr[GIT_OID_HEXSZ + 1];
+		char oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 		git_oid_tostr(oidstr, sizeof(oidstr), git_object_id(obj));
 
 		printf("%s %s\n--\n",
diff --git a/examples/fetch.c b/examples/fetch.c
index 2b5ed1112..bbd882cfb 100644
--- a/examples/fetch.c
+++ b/examples/fetch.c
@@ -15,17 +15,17 @@ static int progress_cb(const char *str, int len, void *data)
  */
 static int update_cb(const char *refname, const git_oid *a, const git_oid *b, void *data)
 {
-	char a_str[GIT_OID_HEXSZ+1], b_str[GIT_OID_HEXSZ+1];
+	char a_str[GIT_OID_SHA1_HEXSIZE+1], b_str[GIT_OID_SHA1_HEXSIZE+1];
 	(void)data;
 
 	git_oid_fmt(b_str, b);
-	b_str[GIT_OID_HEXSZ] = '\0';
+	b_str[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if (git_oid_is_zero(a)) {
 		printf("[new]     %.20s %s\n", b_str, refname);
 	} else {
 		git_oid_fmt(a_str, a);
-		a_str[GIT_OID_HEXSZ] = '\0';
+		a_str[GIT_OID_SHA1_HEXSIZE] = '\0';
 		printf("[updated] %.10s..%.10s %s\n", a_str, b_str, refname);
 	}
 
diff --git a/examples/for-each-ref.c b/examples/for-each-ref.c
index 020dab474..a0706741a 100644
--- a/examples/for-each-ref.c
+++ b/examples/for-each-ref.c
@@ -5,7 +5,7 @@ static int show_ref(git_reference *ref, void *data)
 {
 	git_repository *repo = data;
 	git_reference *resolved = NULL;
-	char hex[GIT_OID_HEXSZ+1];
+	char hex[GIT_OID_SHA1_HEXSIZE+1];
 	const git_oid *oid;
 	git_object *obj;
 	
@@ -16,7 +16,7 @@ static int show_ref(git_reference *ref, void *data)
 	
 	oid = git_reference_target(resolved ? resolved : ref);
 	git_oid_fmt(hex, oid);
-	hex[GIT_OID_HEXSZ] = 0;
+	hex[GIT_OID_SHA1_HEXSIZE] = 0;
 	check_lg2(git_object_lookup(&obj, repo, oid, GIT_OBJECT_ANY),
 			  "Unable to lookup object", hex);
 	
diff --git a/examples/general.c b/examples/general.c
index 2127ec0e1..9e678f887 100644
--- a/examples/general.c
+++ b/examples/general.c
@@ -129,7 +129,7 @@ int lg2_general(git_repository *repo, int argc, char** argv)
  */
 static void oid_parsing(git_oid *oid)
 {
-	char out[GIT_OID_HEXSZ+1];
+	char out[GIT_OID_SHA1_HEXSIZE+1];
 	char hex[] = "4a202b346bb0fb0db7eff3cffeb3c70babbd2045";
 
 	printf("*Hex to Raw*\n");
@@ -152,7 +152,7 @@ static void oid_parsing(git_oid *oid)
 	 * char hex value.
 	 */
 	printf("\n*Raw to Hex*\n");
-	out[GIT_OID_HEXSZ] = '\0';
+	out[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	/**
 	 * If you have a oid, you can easily get the hex value of the SHA as well.
@@ -173,7 +173,7 @@ static void oid_parsing(git_oid *oid)
  */
 static void object_database(git_repository *repo, git_oid *oid)
 {
-	char oid_hex[GIT_OID_HEXSZ+1] = { 0 };
+	char oid_hex[GIT_OID_SHA1_HEXSIZE+1] = { 0 };
 	const unsigned char *data;
 	const char *str_type;
 	int error;
@@ -266,7 +266,7 @@ static void commit_writing(git_repository *repo)
 	git_tree *tree;
 	git_commit *parent;
 	git_signature *author, *committer;
-	char oid_hex[GIT_OID_HEXSZ+1] = { 0 };
+	char oid_hex[GIT_OID_SHA1_HEXSIZE+1] = { 0 };
 
 	printf("\n*Commit Writing*\n");
 
@@ -345,7 +345,7 @@ static void commit_parsing(git_repository *repo)
 	const git_signature *author, *cmtter;
 	git_commit *commit, *parent;
 	git_oid oid;
-	char oid_hex[GIT_OID_HEXSZ+1];
+	char oid_hex[GIT_OID_SHA1_HEXSIZE+1];
 	const char *message;
 	unsigned int parents, p;
 	int error;
@@ -679,7 +679,7 @@ static void reference_listing(git_repository *repo)
 
 	for (i = 0; i < ref_list.count; ++i) {
 		git_reference *ref;
-		char oid_hex[GIT_OID_HEXSZ+1] = GIT_OID_HEX_ZERO;
+		char oid_hex[GIT_OID_SHA1_HEXSIZE+1] = GIT_OID_HEX_ZERO;
 		const char *refname;
 
 		refname = ref_list.strings[i];
diff --git a/examples/log.c b/examples/log.c
index 9060f3f3e..4b0a95dcd 100644
--- a/examples/log.c
+++ b/examples/log.c
@@ -329,7 +329,7 @@ static void print_time(const git_time *intime, const char *prefix)
 /** Helper to print a commit object. */
 static void print_commit(git_commit *commit, struct log_options *opts)
 {
-	char buf[GIT_OID_HEXSZ + 1];
+	char buf[GIT_OID_SHA1_HEXSIZE + 1];
 	int i, count;
 	const git_signature *sig;
 	const char *scan, *eol;
diff --git a/examples/ls-remote.c b/examples/ls-remote.c
index 03ed887d1..24caae712 100644
--- a/examples/ls-remote.c
+++ b/examples/ls-remote.c
@@ -34,7 +34,7 @@ static int use_remote(git_repository *repo, char *name)
 		goto cleanup;
 
 	for (i = 0; i < refs_len; i++) {
-		char oid[GIT_OID_HEXSZ + 1] = {0};
+		char oid[GIT_OID_SHA1_HEXSIZE + 1] = {0};
 		git_oid_fmt(oid, &refs[i]->oid);
 		printf("%s\t%s\n", oid, refs[i]->name);
 	}
diff --git a/examples/rev-list.c b/examples/rev-list.c
index d10f16690..0ca40a20e 100644
--- a/examples/rev-list.c
+++ b/examples/rev-list.c
@@ -26,7 +26,7 @@ int lg2_rev_list(git_repository *repo, int argc, char **argv)
 	git_revwalk *walk;
 	git_oid oid;
 	git_sort_t sort;
-	char buf[GIT_OID_HEXSZ+1];
+	char buf[GIT_OID_SHA1_HEXSIZE+1];
 
 	check_lg2(revwalk_parse_options(&sort, &args), "parsing options", NULL);
 
@@ -36,7 +36,7 @@ int lg2_rev_list(git_repository *repo, int argc, char **argv)
 
 	while (!git_revwalk_next(&oid, walk)) {
 		git_oid_fmt(buf, &oid);
-		buf[GIT_OID_HEXSZ] = '\0';
+		buf[GIT_OID_SHA1_HEXSIZE] = '\0';
 		printf("%s\n", buf);
 	}
 
diff --git a/examples/rev-parse.c b/examples/rev-parse.c
index 90258c101..3f68d79b7 100644
--- a/examples/rev-parse.c
+++ b/examples/rev-parse.c
@@ -65,7 +65,7 @@ static void parse_opts(struct parse_state *ps, int argc, char *argv[])
 static int parse_revision(git_repository *repo, struct parse_state *ps)
 {
 	git_revspec rs;
-	char str[GIT_OID_HEXSZ + 1];
+	char str[GIT_OID_SHA1_HEXSIZE + 1];
 
 	check_lg2(git_revparse(&rs, repo, ps->spec), "Could not parse", ps->spec);
 
diff --git a/examples/show-index.c b/examples/show-index.c
index 7aaa45e65..fb797e04b 100644
--- a/examples/show-index.c
+++ b/examples/show-index.c
@@ -20,8 +20,8 @@ int lg2_show_index(git_repository *repo, int argc, char **argv)
 	size_t i, ecount;
 	char *dir = ".";
 	size_t dirlen;
-	char out[GIT_OID_HEXSZ+1];
-	out[GIT_OID_HEXSZ] = '\0';
+	char out[GIT_OID_SHA1_HEXSIZE+1];
+	out[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if (argc > 2)
 		fatal("usage: showindex [<repo-dir>]", NULL);
diff --git a/fuzzers/commit_graph_fuzzer.c b/fuzzers/commit_graph_fuzzer.c
index 1c46d78c7..f037801cf 100644
--- a/fuzzers/commit_graph_fuzzer.c
+++ b/fuzzers/commit_graph_fuzzer.c
@@ -62,7 +62,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 		memcpy(commit_graph_buf.ptr, data, size);
 		memcpy(commit_graph_buf.ptr + size, hash, GIT_HASH_SHA1_SIZE);
 
-		memcpy(oid.id, hash, GIT_OID_RAWSZ);
+		memcpy(oid.id, hash, GIT_OID_SHA1_SIZE);
 	} else {
 		git_str_attach_notowned(&commit_graph_buf, (char *)data, size);
 	}
@@ -75,7 +75,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 		goto cleanup;
 
 	/* Search for any oid, just to exercise that codepath. */
-	if (git_commit_graph_entry_find(&e, &file, &oid, GIT_OID_HEXSZ) < 0)
+	if (git_commit_graph_entry_find(&e, &file, &oid, GIT_OID_SHA1_HEXSIZE) < 0)
 		goto cleanup;
 
 cleanup:
diff --git a/fuzzers/midx_fuzzer.c b/fuzzers/midx_fuzzer.c
index 4c3124e47..8cd1102a6 100644
--- a/fuzzers/midx_fuzzer.c
+++ b/fuzzers/midx_fuzzer.c
@@ -61,7 +61,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 		memcpy(midx_buf.ptr, data, size);
 		memcpy(midx_buf.ptr + size, hash, GIT_HASH_SHA1_SIZE);
 
-		memcpy(oid.id, hash, GIT_OID_RAWSZ);
+		memcpy(oid.id, hash, GIT_OID_SHA1_SIZE);
 	} else {
 		git_str_attach_notowned(&midx_buf, (char *)data, size);
 	}
@@ -70,7 +70,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 		goto cleanup;
 
 	/* Search for any oid, just to exercise that codepath. */
-	if (git_midx_entry_find(&e, &idx, &oid, GIT_OID_HEXSZ) < 0)
+	if (git_midx_entry_find(&e, &idx, &oid, GIT_OID_SHA1_HEXSIZE) < 0)
 		goto cleanup;
 
 cleanup:
diff --git a/fuzzers/packfile_fuzzer.c b/fuzzers/packfile_fuzzer.c
index 23ecaf80f..7f448f6a4 100644
--- a/fuzzers/packfile_fuzzer.c
+++ b/fuzzers/packfile_fuzzer.c
@@ -94,7 +94,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 			fprintf(stderr, "Failed to compute the SHA1 hash\n");
 			abort();
 		}
-		if (git_indexer_append(indexer, &oid.id, GIT_OID_RAWSZ, &stats) < 0) {
+		if (git_indexer_append(indexer, &oid.id, GIT_OID_SHA1_SIZE, &stats) < 0) {
 			goto cleanup;
 		}
 	}
diff --git a/include/git2/diff.h b/include/git2/diff.h
index 3839f0033..850d215a6 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -274,7 +274,7 @@ typedef struct {
 
 	/**
 	 * Represents the known length of the `id` field, when
-	 * converted to a hex string.  It is generally `GIT_OID_HEXSZ`, unless this
+	 * converted to a hex string.  It is generally `GIT_OID_SHA1_HEXSIZE`, unless this
 	 * delta was created from reading a patch file, in which case it may be
 	 * abbreviated to something reasonable, like 7 characters.
 	 */
diff --git a/include/git2/odb.h b/include/git2/odb.h
index 0ffe3f328..54c38a477 100644
--- a/include/git2/odb.h
+++ b/include/git2/odb.h
@@ -117,7 +117,7 @@ GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *i
  * This method queries all available ODB backends
  * trying to match the 'len' first hexadecimal
  * characters of the 'short_id'.
- * The remaining (GIT_OID_HEXSZ-len)*4 bits of
+ * The remaining (GIT_OID_SHA1_HEXSIZE-len)*4 bits of
  * 'short_id' must be 0s.
  * 'len' must be at least GIT_OID_MINPREFIXLEN,
  * and the prefix must be long enough to identify
@@ -218,7 +218,7 @@ typedef struct git_odb_expand_id {
  *
  * The given array will be updated in place: for each abbreviated ID that is
  * unique in the database, and of the given type (if specified),
- * the full object ID, object ID length (`GIT_OID_HEXSZ`) and type will be
+ * the full object ID, object ID length (`GIT_OID_SHA1_HEXSIZE`) and type will be
  * written back to the array. For IDs that are not found (or are ambiguous),
  * the array entry will be zeroed.
  *
diff --git a/include/git2/oid.h b/include/git2/oid.h
index 549df4eab..0d0f05489 100644
--- a/include/git2/oid.h
+++ b/include/git2/oid.h
@@ -20,10 +20,10 @@
 GIT_BEGIN_DECL
 
 /** Size (in bytes) of a raw/binary oid */
-#define GIT_OID_RAWSZ 20
+#define GIT_OID_SHA1_SIZE 20
 
 /** Size (in bytes) of a hex formatted oid */
-#define GIT_OID_HEXSZ (GIT_OID_RAWSZ * 2)
+#define GIT_OID_SHA1_HEXSIZE (GIT_OID_SHA1_SIZE * 2)
 
 /** Minimum length (in number of hex characters,
  * i.e. packets of 4 bits) of an oid prefix */
@@ -32,7 +32,7 @@ GIT_BEGIN_DECL
 /** Unique identity of any object (commit, tree, blob, tag). */
 typedef struct git_oid {
 	/** raw binary formatted id */
-	unsigned char id[GIT_OID_RAWSZ];
+	unsigned char id[GIT_OID_SHA1_SIZE];
 } git_oid;
 
 /**
@@ -94,7 +94,7 @@ GIT_EXTERN(int) git_oid_fmt(char *out, const git_oid *id);
  * Format a git_oid into a partial hex string.
  *
  * @param out output hex string; you say how many bytes to write.
- *		If the number of bytes is > GIT_OID_HEXSZ, extra bytes
+ *		If the number of bytes is > GIT_OID_SHA1_HEXSIZE, extra bytes
  *		will be zeroed; if not, a '\0' terminator is NOT added.
  * @param n number of characters to write into out string
  * @param id oid structure to format.
@@ -134,7 +134,7 @@ GIT_EXTERN(char *) git_oid_tostr_s(const git_oid *oid);
 /**
  * Format a git_oid into a buffer as a hex format c-string.
  *
- * If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting
+ * If the buffer is smaller than GIT_OID_SHA1_HEXSIZE+1, then the resulting
  * oid c-string will be truncated to n-1 characters (but will still be
  * NUL-byte terminated).
  *
diff --git a/include/git2/sys/odb_backend.h b/include/git2/sys/odb_backend.h
index 8598f94e5..c42abd370 100644
--- a/include/git2/sys/odb_backend.h
+++ b/include/git2/sys/odb_backend.h
@@ -36,7 +36,7 @@ struct git_odb_backend {
 		void **, size_t *, git_object_t *, git_odb_backend *, const git_oid *);
 
 	/* To find a unique object given a prefix of its oid.  The oid given
-	 * must be so that the remaining (GIT_OID_HEXSZ - len)*4 bits are 0s.
+	 * must be so that the remaining (GIT_OID_SHA1_HEXSIZE - len)*4 bits are 0s.
 	 */
 	int GIT_CALLBACK(read_prefix)(
 		git_oid *, void **, size_t *, git_object_t *,
diff --git a/src/libgit2/annotated_commit.c b/src/libgit2/annotated_commit.c
index e48947679..7bd8b6077 100644
--- a/src/libgit2/annotated_commit.c
+++ b/src/libgit2/annotated_commit.c
@@ -40,7 +40,7 @@ static int annotated_commit_init(
 		goto done;
 
 	git_oid_fmt(annotated_commit->id_str, git_commit_id(commit));
-	annotated_commit->id_str[GIT_OID_HEXSZ] = '\0';
+	annotated_commit->id_str[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if (!description)
 		description = annotated_commit->id_str;
diff --git a/src/libgit2/annotated_commit.h b/src/libgit2/annotated_commit.h
index 444a2ed10..c87eaa805 100644
--- a/src/libgit2/annotated_commit.h
+++ b/src/libgit2/annotated_commit.h
@@ -41,7 +41,7 @@ struct git_annotated_commit {
 	const char *ref_name;
 	const char *remote_url;
 
-	char id_str[GIT_OID_HEXSZ+1];
+	char id_str[GIT_OID_SHA1_HEXSIZE+1];
 };
 
 extern int git_annotated_commit_from_head(git_annotated_commit **out,
diff --git a/src/libgit2/branch.c b/src/libgit2/branch.c
index 2e29af99d..458884138 100644
--- a/src/libgit2/branch.c
+++ b/src/libgit2/branch.c
@@ -123,9 +123,9 @@ int git_branch_create(
 	const git_commit *commit,
 	int force)
 {
-	char commit_id[GIT_OID_HEXSZ + 1];
+	char commit_id[GIT_OID_SHA1_HEXSIZE + 1];
 
-	git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit));
+	git_oid_tostr(commit_id, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit));
 	return create_branch(ref_out, repository, branch_name, commit, commit_id, force);
 }
 
diff --git a/src/libgit2/cherrypick.c b/src/libgit2/cherrypick.c
index 9ec4962b9..04812b1c6 100644
--- a/src/libgit2/cherrypick.c
+++ b/src/libgit2/cherrypick.c
@@ -106,10 +106,10 @@ static int cherrypick_state_cleanup(git_repository *repo)
 
 static int cherrypick_seterr(git_commit *commit, const char *fmt)
 {
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_error_set(GIT_ERROR_CHERRYPICK, fmt,
-		git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
+		git_oid_tostr(commit_oidstr, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit)));
 
 	return -1;
 }
@@ -173,7 +173,7 @@ int git_cherrypick(
 	git_cherrypick_options opts;
 	git_reference *our_ref = NULL;
 	git_commit *our_commit = NULL;
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 	const char *commit_msg, *commit_summary;
 	git_str their_label = GIT_STR_INIT;
 	git_index *index = NULL;
diff --git a/src/libgit2/commit.c b/src/libgit2/commit.c
index b137463f3..9516e9209 100644
--- a/src/libgit2/commit.c
+++ b/src/libgit2/commit.c
@@ -411,7 +411,7 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	    if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
 			goto bad_buffer;
 	} else {
-		size_t tree_len = strlen("tree ") + GIT_OID_HEXSZ + 1;
+		size_t tree_len = strlen("tree ") + GIT_OID_SHA1_HEXSIZE + 1;
 		if (buffer + tree_len > buffer_end)
 			goto bad_buffer;
 		buffer += tree_len;
diff --git a/src/libgit2/commit_graph.c b/src/libgit2/commit_graph.c
index 10947acec..7e98ffb27 100644
--- a/src/libgit2/commit_graph.c
+++ b/src/libgit2/commit_graph.c
@@ -138,18 +138,18 @@ static int commit_graph_parse_oid_lookup(
 		struct git_commit_graph_chunk *chunk_oid_lookup)
 {
 	uint32_t i;
-	unsigned char *oid, *prev_oid, zero_oid[GIT_OID_RAWSZ] = {0};
+	unsigned char *oid, *prev_oid, zero_oid[GIT_OID_SHA1_SIZE] = {0};
 
 	if (chunk_oid_lookup->offset == 0)
 		return commit_graph_error("missing OID Lookup chunk");
 	if (chunk_oid_lookup->length == 0)
 		return commit_graph_error("empty OID Lookup chunk");
-	if (chunk_oid_lookup->length != file->num_commits * GIT_OID_RAWSZ)
+	if (chunk_oid_lookup->length != file->num_commits * GIT_OID_SHA1_SIZE)
 		return commit_graph_error("OID Lookup chunk has wrong length");
 
 	file->oid_lookup = oid = (unsigned char *)(data + chunk_oid_lookup->offset);
 	prev_oid = zero_oid;
-	for (i = 0; i < file->num_commits; ++i, oid += GIT_OID_RAWSZ) {
+	for (i = 0; i < file->num_commits; ++i, oid += GIT_OID_SHA1_SIZE) {
 		if (git_oid_raw_cmp(prev_oid, oid) >= 0)
 			return commit_graph_error("OID Lookup index is non-monotonic");
 		prev_oid = oid;
@@ -167,7 +167,7 @@ static int commit_graph_parse_commit_data(
 		return commit_graph_error("missing Commit Data chunk");
 	if (chunk_commit_data->length == 0)
 		return commit_graph_error("empty Commit Data chunk");
-	if (chunk_commit_data->length != file->num_commits * (GIT_OID_RAWSZ + 16))
+	if (chunk_commit_data->length != file->num_commits * (GIT_OID_SHA1_SIZE + 16))
 		return commit_graph_error("Commit Data chunk has wrong length");
 
 	file->commit_data = data + chunk_commit_data->offset;
@@ -210,7 +210,7 @@ int git_commit_graph_file_parse(
 
 	GIT_ASSERT_ARG(file);
 
-	if (size < sizeof(struct git_commit_graph_header) + GIT_OID_RAWSZ)
+	if (size < sizeof(struct git_commit_graph_header) + GIT_OID_SHA1_SIZE)
 		return commit_graph_error("commit-graph is too short");
 
 	hdr = ((struct git_commit_graph_header *)data);
@@ -227,7 +227,7 @@ int git_commit_graph_file_parse(
 	 * headers, and a special zero chunk.
 	 */
 	last_chunk_offset = sizeof(struct git_commit_graph_header) + (1 + hdr->chunks) * 12;
-	trailer_offset = size - GIT_OID_RAWSZ;
+	trailer_offset = size - GIT_OID_SHA1_SIZE;
 	checksum_size = GIT_HASH_SHA1_SIZE;
 
 	if (trailer_offset < last_chunk_offset)
@@ -436,15 +436,15 @@ static int git_commit_graph_entry_get_byindex(
 		return GIT_ENOTFOUND;
 	}
 
-	commit_data = file->commit_data + pos * (GIT_OID_RAWSZ + 4 * sizeof(uint32_t));
+	commit_data = file->commit_data + pos * (GIT_OID_SHA1_SIZE + 4 * sizeof(uint32_t));
 	git_oid_fromraw(&e->tree_oid, commit_data);
-	e->parent_indices[0] = ntohl(*((uint32_t *)(commit_data + GIT_OID_RAWSZ)));
+	e->parent_indices[0] = ntohl(*((uint32_t *)(commit_data + GIT_OID_SHA1_SIZE)));
 	e->parent_indices[1] = ntohl(
-			*((uint32_t *)(commit_data + GIT_OID_RAWSZ + sizeof(uint32_t))));
+			*((uint32_t *)(commit_data + GIT_OID_SHA1_SIZE + sizeof(uint32_t))));
 	e->parent_count = (e->parent_indices[0] != GIT_COMMIT_GRAPH_MISSING_PARENT)
 			+ (e->parent_indices[1] != GIT_COMMIT_GRAPH_MISSING_PARENT);
-	e->generation = ntohl(*((uint32_t *)(commit_data + GIT_OID_RAWSZ + 2 * sizeof(uint32_t))));
-	e->commit_time = ntohl(*((uint32_t *)(commit_data + GIT_OID_RAWSZ + 3 * sizeof(uint32_t))));
+	e->generation = ntohl(*((uint32_t *)(commit_data + GIT_OID_SHA1_SIZE + 2 * sizeof(uint32_t))));
+	e->commit_time = ntohl(*((uint32_t *)(commit_data + GIT_OID_SHA1_SIZE + 3 * sizeof(uint32_t))));
 
 	e->commit_time |= (e->generation & UINT64_C(0x3)) << UINT64_C(32);
 	e->generation >>= 2u;
@@ -471,7 +471,7 @@ static int git_commit_graph_entry_get_byindex(
 		}
 	}
 
-	git_oid_fromraw(&e->sha1, &file->oid_lookup[pos * GIT_OID_RAWSZ]);
+	git_oid_fromraw(&e->sha1, &file->oid_lookup[pos * GIT_OID_SHA1_SIZE]);
 	return 0;
 }
 
@@ -524,27 +524,27 @@ int git_commit_graph_entry_find(
 	hi = ntohl(file->oid_fanout[(int)short_oid->id[0]]);
 	lo = ((short_oid->id[0] == 0x0) ? 0 : ntohl(file->oid_fanout[(int)short_oid->id[0] - 1]));
 
-	pos = git_pack__lookup_sha1(file->oid_lookup, GIT_OID_RAWSZ, lo, hi, short_oid->id);
+	pos = git_pack__lookup_sha1(file->oid_lookup, GIT_OID_SHA1_SIZE, lo, hi, short_oid->id);
 
 	if (pos >= 0) {
 		/* An object matching exactly the oid was found */
 		found = 1;
-		current = file->oid_lookup + (pos * GIT_OID_RAWSZ);
+		current = file->oid_lookup + (pos * GIT_OID_SHA1_SIZE);
 	} else {
 		/* No object was found */
 		/* pos refers to the object with the "closest" oid to short_oid */
 		pos = -1 - pos;
 		if (pos < (int)file->num_commits) {
-			current = file->oid_lookup + (pos * GIT_OID_RAWSZ);
+			current = file->oid_lookup + (pos * GIT_OID_SHA1_SIZE);
 
 			if (!git_oid_raw_ncmp(short_oid->id, current, len))
 				found = 1;
 		}
 	}
 
-	if (found && len != GIT_OID_HEXSZ && pos + 1 < (int)file->num_commits) {
+	if (found && len != GIT_OID_SHA1_HEXSIZE && pos + 1 < (int)file->num_commits) {
 		/* Check for ambiguousity */
-		const unsigned char *next = current + GIT_OID_RAWSZ;
+		const unsigned char *next = current + GIT_OID_SHA1_SIZE;
 
 		if (!git_oid_raw_ncmp(short_oid->id, next, len))
 			found = 2;
@@ -1020,7 +1020,7 @@ static int commit_graph_write(
 	git_vector_foreach (&w->commits, i, packed_commit) {
 		error = git_str_put(&oid_lookup,
 			(const char *)&packed_commit->sha1.id,
-			GIT_OID_RAWSZ);
+			GIT_OID_SHA1_SIZE);
 
 		if (error < 0)
 			goto cleanup;
@@ -1037,7 +1037,7 @@ static int commit_graph_write(
 
 		error = git_str_put(&commit_data,
 			(const char *)&packed_commit->tree_oid.id,
-			GIT_OID_RAWSZ);
+			GIT_OID_SHA1_SIZE);
 
 		if (error < 0)
 			goto cleanup;
diff --git a/src/libgit2/commit_list.c b/src/libgit2/commit_list.c
index 4585508bc..511d7291f 100644
--- a/src/libgit2/commit_list.c
+++ b/src/libgit2/commit_list.c
@@ -172,7 +172,7 @@ int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit)
 	if (cgraph_file) {
 		git_commit_graph_entry e;
 
-		error = git_commit_graph_entry_find(&e, cgraph_file, &commit->oid, GIT_OID_RAWSZ);
+		error = git_commit_graph_entry_find(&e, cgraph_file, &commit->oid, GIT_OID_SHA1_SIZE);
 		if (error == 0 && git__is_uint16(e.parent_count)) {
 			size_t i;
 			commit->generation = (uint32_t)e.generation;
diff --git a/src/libgit2/describe.c b/src/libgit2/describe.c
index 1033eac50..20a171aa5 100644
--- a/src/libgit2/describe.c
+++ b/src/libgit2/describe.c
@@ -368,7 +368,7 @@ static int find_unique_abbrev_size(
 	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
 		return error;
 
-	while (size < GIT_OID_HEXSZ) {
+	while (size < GIT_OID_SHA1_HEXSIZE) {
 		if ((error = git_odb_exists_prefix(&dummy, odb, oid_in, size)) == 0) {
 			*out = (int) size;
 			return 0;
@@ -383,7 +383,7 @@ static int find_unique_abbrev_size(
 	}
 
 	/* If we didn't find any shorter prefix, we have to do the whole thing */
-	*out = GIT_OID_HEXSZ;
+	*out = GIT_OID_SHA1_HEXSIZE;
 
 	return 0;
 }
@@ -397,7 +397,7 @@ static int show_suffix(
 {
 	int error, size = 0;
 
-	char hex_oid[GIT_OID_HEXSZ];
+	char hex_oid[GIT_OID_SHA1_HEXSIZE];
 
 	if ((error = find_unique_abbrev_size(&size, repo, id, abbrev_size)) < 0)
 		return error;
@@ -414,7 +414,7 @@ static int show_suffix(
 #define MAX_CANDIDATES_TAGS FLAG_BITS - 1
 
 static int describe_not_found(const git_oid *oid, const char *message_format) {
-	char oid_str[GIT_OID_HEXSZ + 1];
+	char oid_str[GIT_OID_SHA1_HEXSIZE + 1];
 	git_oid_tostr(oid_str, sizeof(oid_str), oid);
 
 	git_error_set(GIT_ERROR_DESCRIBE, message_format, oid_str);
@@ -525,7 +525,7 @@ static int describe(
 		if (annotated_cnt && (git_pqueue_size(&list) == 0)) {
 			/*
 			if (debug) {
-				char oid_str[GIT_OID_HEXSZ + 1];
+				char oid_str[GIT_OID_SHA1_HEXSIZE + 1];
 				git_oid_tostr(oid_str, sizeof(oid_str), &c->oid);
 
 				fprintf(stderr, "finished search at %s\n", oid_str);
@@ -592,7 +592,7 @@ static int describe(
 			"head", "lightweight", "annotated",
 		};
 
-		char oid_str[GIT_OID_HEXSZ + 1];
+		char oid_str[GIT_OID_SHA1_HEXSIZE + 1];
 
 		if (debug) {
 			for (cur_match = 0; cur_match < match_cnt; cur_match++) {
@@ -816,7 +816,7 @@ static int git_describe__format(
 
 	/* If we didn't find *any* tags, we fall back to the commit's id */
 	if (result->fallback_to_id) {
-		char hex_oid[GIT_OID_HEXSZ + 1] = {0};
+		char hex_oid[GIT_OID_SHA1_HEXSIZE + 1] = {0};
 		int size = 0;
 
 		if ((error = find_unique_abbrev_size(
diff --git a/src/libgit2/diff.c b/src/libgit2/diff.c
index 9840d6050..f593f7336 100644
--- a/src/libgit2/diff.c
+++ b/src/libgit2/diff.c
@@ -290,7 +290,7 @@ static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
 	    (error = git_hash_init(ctx)) < 0)
 		return error;
 
-	for (i = 0; i < GIT_OID_RAWSZ; i++) {
+	for (i = 0; i < GIT_OID_SHA1_SIZE; i++) {
 		carry += result->id[i] + hash.id[i];
 		result->id[i] = (unsigned char)carry;
 		carry >>= 8;
diff --git a/src/libgit2/diff_file.c b/src/libgit2/diff_file.c
index c7e9fbeee..8006b31df 100644
--- a/src/libgit2/diff_file.c
+++ b/src/libgit2/diff_file.c
@@ -153,7 +153,7 @@ int git_diff_file_content__init_from_src(
 			git_blob_dup((git_blob **)&fc->blob, (git_blob *) src->blob);
 			fc->file->size = git_blob_rawsize(src->blob);
 			git_oid_cpy(&fc->file->id, git_blob_id(src->blob));
-			fc->file->id_abbrev = GIT_OID_HEXSZ;
+			fc->file->id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 			fc->map.len  = (size_t)fc->file->size;
 			fc->map.data = (char *)git_blob_rawcontent(src->blob);
@@ -164,7 +164,7 @@ int git_diff_file_content__init_from_src(
 			if ((error = git_odb_hash(&fc->file->id, src->buf, src->buflen, GIT_OBJECT_BLOB)) < 0)
 				return error;
 			fc->file->size = src->buflen;
-			fc->file->id_abbrev = GIT_OID_HEXSZ;
+			fc->file->id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 			fc->map.len  = src->buflen;
 			fc->map.data = (char *)src->buf;
@@ -177,7 +177,7 @@ int git_diff_file_content__init_from_src(
 static int diff_file_content_commit_to_str(
 	git_diff_file_content *fc, bool check_status)
 {
-	char oid[GIT_OID_HEXSZ+1];
+	char oid[GIT_OID_SHA1_HEXSIZE+1];
 	git_str content = GIT_STR_INIT;
 	const char *status = "";
 
diff --git a/src/libgit2/diff_generate.c b/src/libgit2/diff_generate.c
index cfaefba66..16efbc7f6 100644
--- a/src/libgit2/diff_generate.c
+++ b/src/libgit2/diff_generate.c
@@ -188,13 +188,13 @@ static int diff_delta__from_one(
 		delta->old_file.size = entry->file_size;
 		delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS;
 		git_oid_cpy(&delta->old_file.id, &entry->id);
-		delta->old_file.id_abbrev = GIT_OID_HEXSZ;
+		delta->old_file.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 	} else /* ADDED, IGNORED, UNTRACKED */ {
 		delta->new_file.mode = entry->mode;
 		delta->new_file.size = entry->file_size;
 		delta->new_file.flags |= GIT_DIFF_FLAG_EXISTS;
 		git_oid_cpy(&delta->new_file.id, &entry->id);
-		delta->new_file.id_abbrev = GIT_OID_HEXSZ;
+		delta->new_file.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 	}
 
 	delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
@@ -249,14 +249,14 @@ static int diff_delta__from_two(
 		delta->old_file.size = old_entry->file_size;
 		delta->old_file.mode = old_mode;
 		git_oid_cpy(&delta->old_file.id, old_id);
-		delta->old_file.id_abbrev = GIT_OID_HEXSZ;
+		delta->old_file.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 		delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID |
 			GIT_DIFF_FLAG_EXISTS;
 	}
 
 	if (!git_index_entry_is_conflict(new_entry)) {
 		git_oid_cpy(&delta->new_file.id, new_id);
-		delta->new_file.id_abbrev = GIT_OID_HEXSZ;
+		delta->new_file.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 		delta->new_file.size = new_entry->file_size;
 		delta->new_file.mode = new_mode;
 		delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS;
@@ -1695,11 +1695,11 @@ int git_diff__commit(
 	*out = NULL;
 
 	if ((parents = git_commit_parentcount(commit)) > 1) {
-		char commit_oidstr[GIT_OID_HEXSZ + 1];
+		char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 		error = -1;
 		git_error_set(GIT_ERROR_INVALID, "commit %s is a merge commit",
-			git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
+			git_oid_tostr(commit_oidstr, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit)));
 		goto on_error;
 	}
 
diff --git a/src/libgit2/diff_print.c b/src/libgit2/diff_print.c
index 6c5a2cdc8..3077e11e1 100644
--- a/src/libgit2/diff_print.c
+++ b/src/libgit2/diff_print.c
@@ -53,8 +53,8 @@ static int diff_print_info_init__common(
 			return -1;
 	}
 
-	if (pi->id_strlen > GIT_OID_HEXSZ)
-		pi->id_strlen = GIT_OID_HEXSZ;
+	if (pi->id_strlen > GIT_OID_SHA1_HEXSIZE)
+		pi->id_strlen = GIT_OID_SHA1_HEXSIZE;
 
 	memset(&pi->line, 0, sizeof(pi->line));
 	pi->line.old_lineno = -1;
@@ -212,7 +212,7 @@ static int diff_print_one_raw(
 	git_str *out = pi->buf;
 	int id_abbrev;
 	char code = git_diff_status_char(delta->status);
-	char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
+	char start_oid[GIT_OID_SHA1_HEXSIZE+1], end_oid[GIT_OID_SHA1_HEXSIZE+1];
 
 	GIT_UNUSED(progress);
 
@@ -235,7 +235,7 @@ static int diff_print_one_raw(
 	git_oid_tostr(end_oid, pi->id_strlen + 1, &delta->new_file.id);
 
 	git_str_printf(
-		out, (pi->id_strlen <= GIT_OID_HEXSZ) ?
+		out, (pi->id_strlen <= GIT_OID_SHA1_HEXSIZE) ?
 			":%06o %06o %s... %s... %c" : ":%06o %06o %s %s %c",
 		delta->old_file.mode, delta->new_file.mode, start_oid, end_oid, code);
 
@@ -273,7 +273,7 @@ static int diff_print_oid_range(
 	git_str *out, const git_diff_delta *delta, int id_strlen,
 	bool print_index)
 {
-	char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1];
+	char start_oid[GIT_OID_SHA1_HEXSIZE+1], end_oid[GIT_OID_SHA1_HEXSIZE+1];
 
 	if (delta->old_file.mode &&
 			id_strlen > delta->old_file.id_abbrev) {
diff --git a/src/libgit2/email.c b/src/libgit2/email.c
index e19a2928c..0a75021c8 100644
--- a/src/libgit2/email.c
+++ b/src/libgit2/email.c
@@ -130,11 +130,11 @@ static int append_header(
 	const git_signature *author,
 	git_email_create_options *opts)
 {
-	char id[GIT_OID_HEXSZ];
+	char id[GIT_OID_SHA1_HEXSIZE];
 	int error;
 
 	if ((error = git_oid_fmt(id, commit_id)) < 0 ||
-	    (error = git_str_printf(out, "From %.*s %s\n", GIT_OID_HEXSZ, id, EMAIL_TIMESTAMP)) < 0 ||
+	    (error = git_str_printf(out, "From %.*s %s\n", GIT_OID_SHA1_HEXSIZE, id, EMAIL_TIMESTAMP)) < 0 ||
 	    (error = git_str_printf(out, "From: %s <%s>\n", author->name, author->email)) < 0 ||
 	    (error = append_date(out, &author->when)) < 0 ||
 	    (error = append_subject(out, patch_idx, patch_count, summary, opts)) < 0)
diff --git a/src/libgit2/fetchhead.c b/src/libgit2/fetchhead.c
index 6511124ef..146d891ae 100644
--- a/src/libgit2/fetchhead.c
+++ b/src/libgit2/fetchhead.c
@@ -105,7 +105,7 @@ static int fetchhead_ref_write(
 	git_filebuf *file,
 	git_fetchhead_ref *fetchhead_ref)
 {
-	char oid[GIT_OID_HEXSZ + 1];
+	char oid[GIT_OID_SHA1_HEXSIZE + 1];
 	const char *type, *name;
 	int head = 0;
 
@@ -113,7 +113,7 @@ static int fetchhead_ref_write(
 	GIT_ASSERT_ARG(fetchhead_ref);
 
 	git_oid_fmt(oid, &fetchhead_ref->oid);
-	oid[GIT_OID_HEXSZ] = '\0';
+	oid[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if (git__prefixcmp(fetchhead_ref->ref_name, GIT_REFS_HEADS_DIR) == 0) {
 		type = "branch ";
@@ -196,7 +196,7 @@ static int fetchhead_ref_parse(
 		*is_merge = 1;
 	}
 
-	if (strlen(oid_str) != GIT_OID_HEXSZ) {
+	if (strlen(oid_str) != GIT_OID_SHA1_HEXSIZE) {
 		git_error_set(GIT_ERROR_FETCHHEAD,
 			"invalid object ID in FETCH_HEAD line %"PRIuZ, line_num);
 		return -1;
diff --git a/src/libgit2/ident.c b/src/libgit2/ident.c
index 53095864e..bf9a4998e 100644
--- a/src/libgit2/ident.c
+++ b/src/libgit2/ident.c
@@ -42,7 +42,7 @@ static int ident_find_id(
 static int ident_insert_id(
 	git_str *to, const git_str *from, const git_filter_source *src)
 {
-	char oid[GIT_OID_HEXSZ+1];
+	char oid[GIT_OID_SHA1_HEXSIZE+1];
 	const char *id_start, *id_end, *from_end = from->ptr + from->size;
 	size_t need_size;
 
@@ -57,7 +57,7 @@ static int ident_insert_id(
 		return GIT_PASSTHROUGH;
 
 	need_size = (size_t)(id_start - from->ptr) +
-		5 /* "$Id: " */ + GIT_OID_HEXSZ + 2 /* " $" */ +
+		5 /* "$Id: " */ + GIT_OID_SHA1_HEXSIZE + 2 /* " $" */ +
 		(size_t)(from_end - id_end);
 
 	if (git_str_grow(to, need_size) < 0)
@@ -65,7 +65,7 @@ static int ident_insert_id(
 
 	git_str_set(to, from->ptr, (size_t)(id_start - from->ptr));
 	git_str_put(to, "$Id: ", 5);
-	git_str_put(to, oid, GIT_OID_HEXSZ);
+	git_str_put(to, oid, GIT_OID_SHA1_HEXSIZE);
 	git_str_put(to, " $", 2);
 	git_str_put(to, id_end, (size_t)(from_end - id_end));
 
diff --git a/src/libgit2/index.c b/src/libgit2/index.c
index f44c507d3..977820a4e 100644
--- a/src/libgit2/index.c
+++ b/src/libgit2/index.c
@@ -74,7 +74,7 @@ struct entry_short {
 	uint32_t uid;
 	uint32_t gid;
 	uint32_t file_size;
-	unsigned char oid[GIT_OID_RAWSZ];
+	unsigned char oid[GIT_OID_SHA1_SIZE];
 	uint16_t flags;
 	char path[1]; /* arbitrary length */
 };
@@ -88,7 +88,7 @@ struct entry_long {
 	uint32_t uid;
 	uint32_t gid;
 	uint32_t file_size;
-	unsigned char oid[GIT_OID_RAWSZ];
+	unsigned char oid[GIT_OID_SHA1_SIZE];
 	uint16_t flags;
 	uint16_t flags_extended;
 	char path[1]; /* arbitrary length */
@@ -2968,7 +2968,7 @@ static int create_reuc_extension_data(git_str *reuc_buf, git_index_reuc_entry *r
 	}
 
 	for (i = 0; i < 3; i++) {
-		if (reuc->mode[i] && (error = git_str_put(reuc_buf, (char *)&reuc->oid[i].id, GIT_OID_RAWSZ)) < 0)
+		if (reuc->mode[i] && (error = git_str_put(reuc_buf, (char *)&reuc->oid[i].id, GIT_OID_SHA1_SIZE)) < 0)
 			return error;
 	}
 
diff --git a/src/libgit2/indexer.c b/src/libgit2/indexer.c
index afb9ce81a..f3d701fdd 100644
--- a/src/libgit2/indexer.c
+++ b/src/libgit2/indexer.c
@@ -68,7 +68,7 @@ struct git_indexer {
 	git_odb *odb;
 
 	/* Fields for calculating the packfile trailer (hash of everything before it) */
-	char inbuf[GIT_OID_RAWSZ];
+	char inbuf[GIT_OID_SHA1_SIZE];
 	size_t inbuf_len;
 	git_hash_ctx trailer;
 };
@@ -272,7 +272,7 @@ static int advance_delta_offset(git_indexer *idx, git_object_t type)
 	GIT_ASSERT_ARG(type == GIT_OBJECT_REF_DELTA || type == GIT_OBJECT_OFS_DELTA);
 
 	if (type == GIT_OBJECT_REF_DELTA) {
-		idx->off += GIT_OID_RAWSZ;
+		idx->off += GIT_OID_SHA1_SIZE;
 	} else {
 		off64_t base_off;
 		int error = get_delta_base(&base_off, idx->pack, &w, &idx->off, type, idx->entry_start);
@@ -587,25 +587,25 @@ static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size)
 		return;
 
 	/* Easy case, dump the buffer and the data minus the last 20 bytes */
-	if (size >= GIT_OID_RAWSZ) {
+	if (size >= GIT_OID_SHA1_SIZE) {
 		git_hash_update(&idx->trailer, idx->inbuf, idx->inbuf_len);
-		git_hash_update(&idx->trailer, data, size - GIT_OID_RAWSZ);
+		git_hash_update(&idx->trailer, data, size - GIT_OID_SHA1_SIZE);
 
-		data += size - GIT_OID_RAWSZ;
-		memcpy(idx->inbuf, data, GIT_OID_RAWSZ);
-		idx->inbuf_len = GIT_OID_RAWSZ;
+		data += size - GIT_OID_SHA1_SIZE;
+		memcpy(idx->inbuf, data, GIT_OID_SHA1_SIZE);
+		idx->inbuf_len = GIT_OID_SHA1_SIZE;
 		return;
 	}
 
 	/* We can just append */
-	if (idx->inbuf_len + size <= GIT_OID_RAWSZ) {
+	if (idx->inbuf_len + size <= GIT_OID_SHA1_SIZE) {
 		memcpy(idx->inbuf + idx->inbuf_len, data, size);
 		idx->inbuf_len += size;
 		return;
 	}
 
 	/* We need to partially drain the buffer and then append */
-	to_keep   = GIT_OID_RAWSZ - size;
+	to_keep   = GIT_OID_SHA1_SIZE - size;
 	to_expell = idx->inbuf_len - to_keep;
 
 	git_hash_update(&idx->trailer, idx->inbuf, to_expell);
@@ -900,7 +900,7 @@ static int index_path(git_str *path, git_indexer *idx, const char *suffix)
 		slash--;
 
 	if (git_str_grow(path, slash + 1 + strlen(prefix) +
-					 GIT_OID_HEXSZ + strlen(suffix) + 1) < 0)
+					 GIT_OID_SHA1_HEXSIZE + strlen(suffix) + 1) < 0)
 		return -1;
 
 	git_str_truncate(path, slash);
@@ -917,7 +917,7 @@ static int index_path(git_str *path, git_indexer *idx, const char *suffix)
  */
 static int seek_back_trailer(git_indexer *idx)
 {
-	idx->pack->mwf.size -= GIT_OID_RAWSZ;
+	idx->pack->mwf.size -= GIT_OID_SHA1_SIZE;
 	return git_mwindow_free_all(&idx->pack->mwf);
 }
 
@@ -977,7 +977,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
 	if ((error = append_to_pack(idx, empty_checksum, checksum_size)) < 0)
 		goto cleanup;
 
-	idx->pack->mwf.size += GIT_OID_RAWSZ;
+	idx->pack->mwf.size += GIT_OID_SHA1_SIZE;
 
 	pentry = git__calloc(1, sizeof(struct git_pack_entry));
 	GIT_ERROR_CHECK_ALLOC(pentry);
@@ -1040,7 +1040,7 @@ static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats)
 	}
 
 	/* curpos now points to the base information, which is an OID */
-	base_info = git_mwindow_open(&idx->pack->mwf, &w, curpos, GIT_OID_RAWSZ, &left);
+	base_info = git_mwindow_open(&idx->pack->mwf, &w, curpos, GIT_OID_SHA1_SIZE, &left);
 	if (base_info == NULL) {
 		git_error_set(GIT_ERROR_INDEXER, "failed to map delta information");
 		return -1;
@@ -1269,7 +1269,7 @@ int git_indexer_commit(git_indexer *idx, git_indexer_progress *stats)
 
 	/* Write out the object names (SHA-1 hashes) */
 	git_vector_foreach(&idx->objects, i, entry) {
-		git_filebuf_write(&index_file, &entry->oid.id, GIT_OID_RAWSZ);
+		git_filebuf_write(&index_file, &entry->oid.id, GIT_OID_SHA1_SIZE);
 	}
 
 	/* Write out the CRC32 values */
diff --git a/src/libgit2/iterator.c b/src/libgit2/iterator.c
index bc6f766ce..6b127afd3 100644
--- a/src/libgit2/iterator.c
+++ b/src/libgit2/iterator.c
@@ -1271,7 +1271,7 @@ static int filesystem_iterator_entry_hash(
 	int error;
 
 	if (S_ISDIR(entry->st.st_mode)) {
-		memset(&entry->id, 0, GIT_OID_RAWSZ);
+		memset(&entry->id, 0, GIT_OID_SHA1_SIZE);
 		return 0;
 	}
 
diff --git a/src/libgit2/merge.c b/src/libgit2/merge.c
index 641b32632..01f60abc5 100644
--- a/src/libgit2/merge.c
+++ b/src/libgit2/merge.c
@@ -611,7 +611,7 @@ int git_repository_mergehead_foreach(
 	buffer = merge_head_file.ptr;
 
 	while ((line = git__strsep(&buffer, "\n")) != NULL) {
-		if (strlen(line) != GIT_OID_HEXSZ) {
+		if (strlen(line) != GIT_OID_SHA1_HEXSIZE) {
 			git_error_set(GIT_ERROR_INVALID, "unable to parse OID - invalid length");
 			error = -1;
 			goto cleanup;
diff --git a/src/libgit2/midx.c b/src/libgit2/midx.c
index 67eab9acb..86803fa64 100644
--- a/src/libgit2/midx.c
+++ b/src/libgit2/midx.c
@@ -115,18 +115,18 @@ static int midx_parse_oid_lookup(
 		struct git_midx_chunk *chunk_oid_lookup)
 {
 	uint32_t i;
-	unsigned char *oid, *prev_oid, zero_oid[GIT_OID_RAWSZ] = {0};
+	unsigned char *oid, *prev_oid, zero_oid[GIT_OID_SHA1_SIZE] = {0};
 
 	if (chunk_oid_lookup->offset == 0)
 		return midx_error("missing OID Lookup chunk");
 	if (chunk_oid_lookup->length == 0)
 		return midx_error("empty OID Lookup chunk");
-	if (chunk_oid_lookup->length != idx->num_objects * GIT_OID_RAWSZ)
+	if (chunk_oid_lookup->length != idx->num_objects * GIT_OID_SHA1_SIZE)
 		return midx_error("OID Lookup chunk has wrong length");
 
 	idx->oid_lookup = oid = (unsigned char *)(data + chunk_oid_lookup->offset);
 	prev_oid = zero_oid;
-	for (i = 0; i < idx->num_objects; ++i, oid += GIT_OID_RAWSZ) {
+	for (i = 0; i < idx->num_objects; ++i, oid += GIT_OID_SHA1_SIZE) {
 		if (git_oid_raw_cmp(prev_oid, oid) >= 0)
 			return midx_error("OID Lookup index is non-monotonic");
 		prev_oid = oid;
@@ -188,7 +188,7 @@ int git_midx_parse(
 
 	GIT_ASSERT_ARG(idx);
 
-	if (size < sizeof(struct git_midx_header) + GIT_OID_RAWSZ)
+	if (size < sizeof(struct git_midx_header) + GIT_OID_SHA1_SIZE)
 		return midx_error("multi-pack index is too short");
 
 	hdr = ((struct git_midx_header *)data);
@@ -365,7 +365,7 @@ bool git_midx_needs_refresh(
 	}
 
 	checksum_size = GIT_HASH_SHA1_SIZE;
-	bytes_read = p_pread(fd, checksum, checksum_size, st.st_size - GIT_OID_RAWSZ);
+	bytes_read = p_pread(fd, checksum, checksum_size, st.st_size - GIT_OID_SHA1_SIZE);
 	p_close(fd);
 
 	if (bytes_read != (ssize_t)checksum_size)
@@ -392,27 +392,27 @@ int git_midx_entry_find(
 	hi = ntohl(idx->oid_fanout[(int)short_oid->id[0]]);
 	lo = ((short_oid->id[0] == 0x0) ? 0 : ntohl(idx->oid_fanout[(int)short_oid->id[0] - 1]));
 
-	pos = git_pack__lookup_sha1(idx->oid_lookup, GIT_OID_RAWSZ, lo, hi, short_oid->id);
+	pos = git_pack__lookup_sha1(idx->oid_lookup, GIT_OID_SHA1_SIZE, lo, hi, short_oid->id);
 
 	if (pos >= 0) {
 		/* An object matching exactly the oid was found */
 		found = 1;
-		current = idx->oid_lookup + (pos * GIT_OID_RAWSZ);
+		current = idx->oid_lookup + (pos * GIT_OID_SHA1_SIZE);
 	} else {
 		/* No object was found */
 		/* pos refers to the object with the "closest" oid to short_oid */
 		pos = -1 - pos;
 		if (pos < (int)idx->num_objects) {
-			current = idx->oid_lookup + (pos * GIT_OID_RAWSZ);
+			current = idx->oid_lookup + (pos * GIT_OID_SHA1_SIZE);
 
 			if (!git_oid_raw_ncmp(short_oid->id, current, len))
 				found = 1;
 		}
 	}
 
-	if (found && len != GIT_OID_HEXSZ && pos + 1 < (int)idx->num_objects) {
+	if (found && len != GIT_OID_SHA1_HEXSIZE && pos + 1 < (int)idx->num_objects) {
 		/* Check for ambiguousity */
-		const unsigned char *next = current + GIT_OID_RAWSZ;
+		const unsigned char *next = current + GIT_OID_SHA1_SIZE;
 
 		if (!git_oid_raw_ncmp(short_oid->id, next, len))
 			found = 2;
@@ -459,7 +459,7 @@ int git_midx_foreach_entry(
 	GIT_ASSERT_ARG(idx);
 
 	for (i = 0; i < idx->num_objects; ++i) {
-		if ((error = git_oid_fromraw(&oid, &idx->oid_lookup[i * GIT_OID_RAWSZ])) < 0)
+		if ((error = git_oid_fromraw(&oid, &idx->oid_lookup[i * GIT_OID_SHA1_SIZE])) < 0)
 			return error;
 
 		if ((error = cb(&oid, data)) != 0)
@@ -748,7 +748,7 @@ static int midx_write(
 
 	/* Fill the OID Lookup table. */
 	git_vector_foreach (&object_entries, i, entry) {
-		error = git_str_put(&oid_lookup, (char *)&entry->sha1.id, GIT_OID_RAWSZ);
+		error = git_str_put(&oid_lookup, (char *)&entry->sha1.id, GIT_OID_SHA1_SIZE);
 		if (error < 0)
 			goto cleanup;
 	}
diff --git a/src/libgit2/notes.c b/src/libgit2/notes.c
index d1a2b0f64..a154d96c7 100644
--- a/src/libgit2/notes.c
+++ b/src/libgit2/notes.c
@@ -460,7 +460,7 @@ int git_note_commit_read(
 {
 	int error;
 	git_tree *tree = NULL;
-	char target[GIT_OID_HEXSZ + 1];
+	char target[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(target, sizeof(target), oid);
 
@@ -507,7 +507,7 @@ int git_note_commit_create(
 {
 	int error;
 	git_tree *tree = NULL;
-	char target[GIT_OID_HEXSZ + 1];
+	char target[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(target, sizeof(target), oid);
 
@@ -578,7 +578,7 @@ int git_note_commit_remove(
 {
 	int error;
 	git_tree *tree = NULL;
-	char target[GIT_OID_HEXSZ + 1];
+	char target[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(target, sizeof(target), oid);
 
@@ -698,7 +698,7 @@ static int process_entry_path(
 	buf.ptr[j] = '\0';
 	buf.size = j;
 
-	if (j != GIT_OID_HEXSZ) {
+	if (j != GIT_OID_SHA1_HEXSIZE) {
 		/* This is not a note entry */
 		goto cleanup;
 	}
diff --git a/src/libgit2/object.c b/src/libgit2/object.c
index b828f88f6..c28093970 100644
--- a/src/libgit2/object.c
+++ b/src/libgit2/object.c
@@ -193,10 +193,10 @@ int git_object_lookup_prefix(
 	if (error < 0)
 		return error;
 
-	if (len > GIT_OID_HEXSZ)
-		len = GIT_OID_HEXSZ;
+	if (len > GIT_OID_SHA1_HEXSIZE)
+		len = GIT_OID_SHA1_HEXSIZE;
 
-	if (len == GIT_OID_HEXSZ) {
+	if (len == GIT_OID_SHA1_HEXSIZE) {
 		git_cached_obj *cached = NULL;
 
 		/* We want to match the full id : we can first look up in the cache,
@@ -234,7 +234,7 @@ int git_object_lookup_prefix(
 
 		git_oid__cpy_prefix(&short_oid, id, len);
 
-		/* If len < GIT_OID_HEXSZ (a strict short oid was given), we have
+		/* If len < GIT_OID_SHA1_HEXSIZE (a strict short oid was given), we have
 		 * 2 options :
 		 * - We always search in the cache first. If we find that short oid is
 		 *	ambiguous, we can stop. But in all the other cases, we must then
@@ -259,7 +259,7 @@ int git_object_lookup_prefix(
 }
 
 int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_object_t type) {
-	return git_object_lookup_prefix(object_out, repo, id, GIT_OID_HEXSZ, type);
+	return git_object_lookup_prefix(object_out, repo, id, GIT_OID_SHA1_HEXSIZE, type);
 }
 
 void git_object_free(git_object *object)
@@ -358,12 +358,12 @@ static int dereference_object(git_object **dereferenced, git_object *obj)
 static int peel_error(int error, const git_oid *oid, git_object_t type)
 {
 	const char *type_name;
-	char hex_oid[GIT_OID_HEXSZ + 1];
+	char hex_oid[GIT_OID_SHA1_HEXSIZE + 1];
 
 	type_name = git_object_type2string(type);
 
 	git_oid_fmt(hex_oid, oid);
-	hex_oid[GIT_OID_HEXSZ] = '\0';
+	hex_oid[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	git_error_set(GIT_ERROR_OBJECT, "the git_object of id '%s' can not be "
 		"successfully peeled into a %s (git_object_t=%i).", hex_oid, type_name, type);
@@ -516,7 +516,7 @@ static int git_object__short_id(git_str *out, const git_object *obj)
 	if ((error = git_repository_odb(&odb, repo)) < 0)
 		return error;
 
-	while (len < GIT_OID_HEXSZ) {
+	while (len < GIT_OID_SHA1_HEXSIZE) {
 		/* set up short oid */
 		memcpy(&id.id, &obj->cached.oid.id, (len + 1) / 2);
 		if (len & 1)
diff --git a/src/libgit2/odb.c b/src/libgit2/odb.c
index 7b98c72ee..43a64fc80 100644
--- a/src/libgit2/odb.c
+++ b/src/libgit2/odb.c
@@ -973,7 +973,7 @@ int git_odb_exists_prefix(
 	if (len < GIT_OID_MINPREFIXLEN)
 		return git_odb__error_ambiguous("prefix length too short");
 
-	if (len >= GIT_OID_HEXSZ) {
+	if (len >= GIT_OID_SHA1_HEXSIZE) {
 		if (git_odb_exists(db, short_id)) {
 			if (out)
 				git_oid_cpy(out, short_id);
@@ -1015,13 +1015,13 @@ int git_odb_expand_ids(
 			query->type = GIT_OBJECT_ANY;
 
 		/* if we have a short OID, expand it first */
-		if (query->length >= GIT_OID_MINPREFIXLEN && query->length < GIT_OID_HEXSZ) {
+		if (query->length >= GIT_OID_MINPREFIXLEN && query->length < GIT_OID_SHA1_HEXSIZE) {
 			git_oid actual_id;
 
 			error = odb_exists_prefix_1(&actual_id, db, &query->id, query->length, false);
 			if (!error) {
 				git_oid_cpy(&query->id, &actual_id);
-				query->length = GIT_OID_HEXSZ;
+				query->length = GIT_OID_SHA1_HEXSIZE;
 			}
 		}
 
@@ -1029,7 +1029,7 @@ int git_odb_expand_ids(
 		 * now we ought to have a 40-char OID, either because we've expanded it
 		 * or because the user passed a full OID. Ensure its type is right.
 		 */
-		if (query->length >= GIT_OID_HEXSZ) {
+		if (query->length >= GIT_OID_SHA1_HEXSIZE) {
 			git_object_t actual_type;
 
 			error = odb_otype_fast(&actual_type, db, &query->id);
@@ -1157,7 +1157,7 @@ int git_odb__read_header_or_object(
 		error = odb_read_header_1(len_p, type_p, db, id, true);
 
 	if (error == GIT_ENOTFOUND)
-		return git_odb__error_notfound("cannot read header for", id, GIT_OID_HEXSZ);
+		return git_odb__error_notfound("cannot read header for", id, GIT_OID_SHA1_HEXSIZE);
 
 	/* we found the header; return early */
 	if (!error)
@@ -1268,7 +1268,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id)
 		error = odb_read_1(out, db, id, true);
 
 	if (error == GIT_ENOTFOUND)
-		return git_odb__error_notfound("no match for id", id, GIT_OID_HEXSZ);
+		return git_odb__error_notfound("no match for id", id, GIT_OID_SHA1_HEXSIZE);
 
 	return error;
 }
@@ -1400,10 +1400,10 @@ int git_odb_read_prefix(
 	if (len < GIT_OID_MINPREFIXLEN)
 		return git_odb__error_ambiguous("prefix length too short");
 
-	if (len > GIT_OID_HEXSZ)
-		len = GIT_OID_HEXSZ;
+	if (len > GIT_OID_SHA1_HEXSIZE)
+		len = GIT_OID_SHA1_HEXSIZE;
 
-	if (len == GIT_OID_HEXSZ) {
+	if (len == GIT_OID_SHA1_HEXSIZE) {
 		*out = git_cache_get_raw(odb_cache(db), short_id);
 		if (*out != NULL)
 			return 0;
@@ -1786,7 +1786,7 @@ int git_odb_refresh(struct git_odb *db)
 
 int git_odb__error_mismatch(const git_oid *expected, const git_oid *actual)
 {
-	char expected_oid[GIT_OID_HEXSZ + 1], actual_oid[GIT_OID_HEXSZ + 1];
+	char expected_oid[GIT_OID_SHA1_HEXSIZE + 1], actual_oid[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_tostr(expected_oid, sizeof(expected_oid), expected);
 	git_oid_tostr(actual_oid, sizeof(actual_oid), actual);
@@ -1801,7 +1801,7 @@ int git_odb__error_notfound(
 	const char *message, const git_oid *oid, size_t oid_len)
 {
 	if (oid != NULL) {
-		char oid_str[GIT_OID_HEXSZ + 1];
+		char oid_str[GIT_OID_SHA1_HEXSIZE + 1];
 		git_oid_tostr(oid_str, oid_len+1, oid);
 		git_error_set(GIT_ERROR_ODB, "object not found - %s (%.*s)",
 			message, (int) oid_len, oid_str);
diff --git a/src/libgit2/odb_loose.c b/src/libgit2/odb_loose.c
index 463e24fa5..4700f9749 100644
--- a/src/libgit2/odb_loose.c
+++ b/src/libgit2/odb_loose.c
@@ -60,11 +60,11 @@ typedef struct loose_backend {
  */
 typedef struct {
 	size_t dir_len;
-	unsigned char short_oid[GIT_OID_HEXSZ]; /* hex formatted oid to match */
+	unsigned char short_oid[GIT_OID_SHA1_HEXSIZE]; /* hex formatted oid to match */
 	size_t short_oid_len;
 	int found;				/* number of matching
 						 * objects already found */
-	unsigned char res_oid[GIT_OID_HEXSZ];	/* hex formatted oid of
+	unsigned char res_oid[GIT_OID_SHA1_HEXSIZE];	/* hex formatted oid of
 						 * the object found */
 } loose_locate_object_state;
 
@@ -81,7 +81,7 @@ static int object_file_name(
 	size_t alloclen;
 
 	/* expand length for object root + 40 hex sha1 chars + 2 * '/' + '\0' */
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, be->objects_dirlen, GIT_OID_HEXSZ);
+	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, be->objects_dirlen, GIT_OID_SHA1_HEXSIZE);
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 3);
 	if (git_str_grow(name, alloclen) < 0)
 		return -1;
@@ -91,7 +91,7 @@ static int object_file_name(
 
 	/* loose object filename: aa/aaa... (41 bytes) */
 	git_oid_pathfmt(name->ptr + name->size, id);
-	name->size += GIT_OID_HEXSZ + 1;
+	name->size += GIT_OID_SHA1_HEXSIZE + 1;
 	name->ptr[name->size] = '\0';
 
 	return 0;
@@ -462,7 +462,7 @@ static int locate_object(
 static int fn_locate_object_short_oid(void *state, git_str *pathbuf) {
 	loose_locate_object_state *sstate = (loose_locate_object_state *)state;
 
-	if (git_str_len(pathbuf) - sstate->dir_len != GIT_OID_HEXSZ - 2) {
+	if (git_str_len(pathbuf) - sstate->dir_len != GIT_OID_SHA1_HEXSIZE - 2) {
 		/* Entry cannot be an object. Continue to next entry */
 		return 0;
 	}
@@ -477,7 +477,7 @@ static int fn_locate_object_short_oid(void *state, git_str *pathbuf) {
 			if (!sstate->found) {
 				sstate->res_oid[0] = sstate->short_oid[0];
 				sstate->res_oid[1] = sstate->short_oid[1];
-				memcpy(sstate->res_oid+2, pathbuf->ptr+sstate->dir_len, GIT_OID_HEXSZ-2);
+				memcpy(sstate->res_oid+2, pathbuf->ptr+sstate->dir_len, GIT_OID_SHA1_HEXSIZE-2);
 			}
 			sstate->found++;
 		}
@@ -503,7 +503,7 @@ static int locate_object_short_oid(
 	int error;
 
 	/* prealloc memory for OBJ_DIR/xx/xx..38x..xx */
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
+	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_SHA1_HEXSIZE);
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 3);
 	if (git_str_grow(object_location, alloc_len) < 0)
 		return -1;
@@ -550,7 +550,7 @@ static int locate_object_short_oid(
 		return error;
 
 	/* Update the location according to the oid obtained */
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
+	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_SHA1_HEXSIZE);
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
 
 	git_str_truncate(object_location, dir_len);
@@ -559,7 +559,7 @@ static int locate_object_short_oid(
 
 	git_oid_pathfmt(object_location->ptr + dir_len, res_oid);
 
-	object_location->size += GIT_OID_HEXSZ + 1;
+	object_location->size += GIT_OID_SHA1_HEXSIZE + 1;
 	object_location->ptr[object_location->size] = '\0';
 
 	return 0;
@@ -595,7 +595,7 @@ static int loose_backend__read_header(size_t *len_p, git_object_t *type_p, git_o
 
 	if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) {
 		error = git_odb__error_notfound("no matching loose object",
-			oid, GIT_OID_HEXSZ);
+			oid, GIT_OID_SHA1_HEXSIZE);
 	} else if ((error = read_header_loose(&raw, &object_path)) == 0) {
 		*len_p = raw.len;
 		*type_p = raw.type;
@@ -617,7 +617,7 @@ static int loose_backend__read(void **buffer_p, size_t *len_p, git_object_t *typ
 
 	if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) {
 		error = git_odb__error_notfound("no matching loose object",
-			oid, GIT_OID_HEXSZ);
+			oid, GIT_OID_SHA1_HEXSIZE);
 	} else if ((error = read_loose(&raw, &object_path)) == 0) {
 		*buffer_p = raw.data;
 		*len_p = raw.len;
@@ -640,9 +640,9 @@ static int loose_backend__read_prefix(
 {
 	int error = 0;
 
-	GIT_ASSERT_ARG(len >= GIT_OID_MINPREFIXLEN && len <= GIT_OID_HEXSZ);
+	GIT_ASSERT_ARG(len >= GIT_OID_MINPREFIXLEN && len <= GIT_OID_SHA1_HEXSIZE);
 
-	if (len == GIT_OID_HEXSZ) {
+	if (len == GIT_OID_SHA1_HEXSIZE) {
 		/* We can fall back to regular read method */
 		error = loose_backend__read(buffer_p, len_p, type_p, backend, short_oid);
 		if (!error)
@@ -711,7 +711,7 @@ struct foreach_state {
 GIT_INLINE(int) filename_to_oid(git_oid *oid, const char *ptr)
 {
 	int v, i = 0;
-	if (strlen(ptr) != GIT_OID_HEXSZ+1)
+	if (strlen(ptr) != GIT_OID_SHA1_HEXSIZE+1)
 		return -1;
 
 	if (ptr[2] != '/') {
@@ -1013,7 +1013,7 @@ static int loose_backend__readstream(
 
 	if (locate_object(&object_path, backend, oid) < 0) {
 		error = git_odb__error_notfound("no matching loose object",
-			oid, GIT_OID_HEXSZ);
+			oid, GIT_OID_SHA1_HEXSIZE);
 		goto done;
 	}
 
diff --git a/src/libgit2/odb_pack.c b/src/libgit2/odb_pack.c
index 818cc6125..2401e9578 100644
--- a/src/libgit2/odb_pack.c
+++ b/src/libgit2/odb_pack.c
@@ -177,7 +177,7 @@ static int pack_entry_find(struct git_pack_entry *e,
  * a prefix of an identifier.
  * Sets GIT_EAMBIGUOUS if short oid is ambiguous.
  * This method assumes that len is between
- * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ.
+ * GIT_OID_MINPREFIXLEN and GIT_OID_SHA1_HEXSIZE.
  */
 static int pack_entry_find_prefix(
 	struct git_pack_entry *e,
@@ -273,7 +273,7 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen
 	size_t i;
 
 	if (backend->midx &&
-		git_midx_entry_find(&midx_entry, backend->midx, oid, GIT_OID_HEXSZ) == 0 &&
+		git_midx_entry_find(&midx_entry, backend->midx, oid, GIT_OID_SHA1_HEXSIZE) == 0 &&
 		midx_entry.pack_index < git_vector_length(&backend->midx_packs)) {
 		e->offset = midx_entry.offset;
 		git_oid_cpy(&e->sha1, &midx_entry.sha1);
@@ -282,21 +282,21 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen
 	}
 
 	if (last_found &&
-		git_pack_entry_find(e, last_found, oid, GIT_OID_HEXSZ) == 0)
+		git_pack_entry_find(e, last_found, oid, GIT_OID_SHA1_HEXSIZE) == 0)
 		return 0;
 
 	git_vector_foreach(&backend->packs, i, p) {
 		if (p == last_found)
 			continue;
 
-		if (git_pack_entry_find(e, p, oid, GIT_OID_HEXSZ) == 0) {
+		if (git_pack_entry_find(e, p, oid, GIT_OID_SHA1_HEXSIZE) == 0) {
 			backend->last_found = p;
 			return 0;
 		}
 	}
 
 	return git_odb__error_notfound(
-		"failed to find pack entry", oid, GIT_OID_HEXSZ);
+		"failed to find pack entry", oid, GIT_OID_SHA1_HEXSIZE);
 }
 
 static int pack_entry_find_prefix(
@@ -605,7 +605,7 @@ static int pack_backend__read_prefix(
 	if (len < GIT_OID_MINPREFIXLEN)
 		error = git_odb__error_ambiguous("prefix length too short");
 
-	else if (len >= GIT_OID_HEXSZ) {
+	else if (len >= GIT_OID_SHA1_HEXSIZE) {
 		/* We can fall back to regular read method */
 		error = pack_backend__read(buffer_p, len_p, type_p, backend, short_oid);
 		if (!error)
diff --git a/src/libgit2/oid.c b/src/libgit2/oid.c
index fb92174ab..a66047d8d 100644
--- a/src/libgit2/oid.c
+++ b/src/libgit2/oid.c
@@ -39,10 +39,10 @@ int git_oid_fromstrn(git_oid *out, const char *str, size_t length)
 	if (!length)
 		return oid_error_invalid("too short");
 
-	if (length > GIT_OID_HEXSZ)
+	if (length > GIT_OID_SHA1_HEXSIZE)
 		return oid_error_invalid("too long");
 
-	memset(out->id, 0, GIT_OID_RAWSZ);
+	memset(out->id, 0, GIT_OID_SHA1_SIZE);
 
 	for (p = 0; p < length; p++) {
 		v = git__fromhex(str[p]);
@@ -62,7 +62,7 @@ int git_oid_fromstrp(git_oid *out, const char *str)
 
 int git_oid_fromstr(git_oid *out, const char *str)
 {
-	return git_oid_fromstrn(out, str, GIT_OID_HEXSZ);
+	return git_oid_fromstrn(out, str, GIT_OID_SHA1_HEXSIZE);
 }
 
 GIT_INLINE(char) *fmt_one(char *str, unsigned int val)
@@ -80,9 +80,9 @@ int git_oid_nfmt(char *str, size_t n, const git_oid *oid)
 		memset(str, 0, n);
 		return 0;
 	}
-	if (n > GIT_OID_HEXSZ) {
-		memset(&str[GIT_OID_HEXSZ], 0, n - GIT_OID_HEXSZ);
-		n = GIT_OID_HEXSZ;
+	if (n > GIT_OID_SHA1_HEXSIZE) {
+		memset(&str[GIT_OID_SHA1_HEXSIZE], 0, n - GIT_OID_SHA1_HEXSIZE);
+		n = GIT_OID_SHA1_HEXSIZE;
 	}
 
 	max_i = n / 2;
@@ -98,7 +98,7 @@ int git_oid_nfmt(char *str, size_t n, const git_oid *oid)
 
 int git_oid_fmt(char *str, const git_oid *oid)
 {
-	return git_oid_nfmt(str, GIT_OID_HEXSZ, oid);
+	return git_oid_nfmt(str, GIT_OID_SHA1_HEXSIZE, oid);
 }
 
 int git_oid_pathfmt(char *str, const git_oid *oid)
@@ -116,16 +116,16 @@ int git_oid_pathfmt(char *str, const git_oid *oid)
 char *git_oid_tostr_s(const git_oid *oid)
 {
 	char *str = GIT_THREADSTATE->oid_fmt;
-	git_oid_nfmt(str, GIT_OID_HEXSZ + 1, oid);
+	git_oid_nfmt(str, GIT_OID_SHA1_HEXSIZE + 1, oid);
 	return str;
 }
 
 char *git_oid_allocfmt(const git_oid *oid)
 {
-	char *str = git__malloc(GIT_OID_HEXSZ + 1);
+	char *str = git__malloc(GIT_OID_SHA1_HEXSIZE + 1);
 	if (!str)
 		return NULL;
-	git_oid_nfmt(str, GIT_OID_HEXSZ + 1, oid);
+	git_oid_nfmt(str, GIT_OID_SHA1_HEXSIZE + 1, oid);
 	return str;
 }
 
@@ -134,8 +134,8 @@ char *git_oid_tostr(char *out, size_t n, const git_oid *oid)
 	if (!out || n == 0)
 		return "";
 
-	if (n > GIT_OID_HEXSZ + 1)
-		n = GIT_OID_HEXSZ + 1;
+	if (n > GIT_OID_SHA1_HEXSIZE + 1)
+		n = GIT_OID_SHA1_HEXSIZE + 1;
 
 	git_oid_nfmt(out, n - 1, oid); /* allow room for terminating NUL */
 	out[n - 1] = '\0';
@@ -147,7 +147,7 @@ int git_oid__parse(
 	git_oid *oid, const char **buffer_out,
 	const char *buffer_end, const char *header)
 {
-	const size_t sha_len = GIT_OID_HEXSZ;
+	const size_t sha_len = GIT_OID_SHA1_HEXSIZE;
 	const size_t header_len = strlen(header);
 
 	const char *buffer = *buffer_out;
@@ -171,11 +171,11 @@ int git_oid__parse(
 
 void git_oid__writebuf(git_str *buf, const char *header, const git_oid *oid)
 {
-	char hex_oid[GIT_OID_HEXSZ];
+	char hex_oid[GIT_OID_SHA1_HEXSIZE];
 
 	git_oid_fmt(hex_oid, oid);
 	git_str_puts(buf, header);
-	git_str_put(buf, hex_oid, GIT_OID_HEXSZ);
+	git_str_put(buf, hex_oid, GIT_OID_SHA1_HEXSIZE);
 	git_str_putc(buf, '\n');
 }
 
@@ -211,7 +211,7 @@ int git_oid_strcmp(const git_oid *oid_a, const char *str)
 	unsigned char strval;
 	int hexval;
 
-	for (a = oid_a->id; *str && (a - oid_a->id) < GIT_OID_RAWSZ; ++a) {
+	for (a = oid_a->id; *str && (a - oid_a->id) < GIT_OID_SHA1_SIZE; ++a) {
 		if ((hexval = git__fromhex(*str++)) < 0)
 			return -1;
 		strval = (unsigned char)(hexval << 4);
@@ -236,7 +236,7 @@ int git_oid_is_zero(const git_oid *oid_a)
 {
 	const unsigned char *a = oid_a->id;
 	unsigned int i;
-	for (i = 0; i < GIT_OID_RAWSZ; ++i, ++a)
+	for (i = 0; i < GIT_OID_SHA1_SIZE; ++i, ++a)
 		if (*a != 0)
 			return 0;
 	return 1;
@@ -393,7 +393,7 @@ int git_oid_shorten_add(git_oid_shorten *os, const char *text_oid)
 	idx = 0;
 	is_leaf = false;
 
-	for (i = 0; i < GIT_OID_HEXSZ; ++i) {
+	for (i = 0; i < GIT_OID_SHA1_HEXSIZE; ++i) {
 		int c = git__fromhex(text_oid[i]);
 		trie_node *node;
 
diff --git a/src/libgit2/oid.h b/src/libgit2/oid.h
index abae9a4b2..b61a17f56 100644
--- a/src/libgit2/oid.h
+++ b/src/libgit2/oid.h
@@ -30,8 +30,8 @@ GIT_INLINE(int) git_oid_raw_ncmp(
 	const unsigned char *sha2,
 	size_t len)
 {
-	if (len > GIT_OID_HEXSZ)
-		len = GIT_OID_HEXSZ;
+	if (len > GIT_OID_SHA1_HEXSIZE)
+		len = GIT_OID_SHA1_HEXSIZE;
 
 	while (len > 1) {
 		if (*sha1 != *sha2)
@@ -52,14 +52,14 @@ GIT_INLINE(int) git_oid_raw_cmp(
 	const unsigned char *sha1,
 	const unsigned char *sha2)
 {
-	return memcmp(sha1, sha2, GIT_OID_RAWSZ);
+	return memcmp(sha1, sha2, GIT_OID_SHA1_SIZE);
 }
 
 GIT_INLINE(int) git_oid_raw_cpy(
 	unsigned char *dst,
 	const unsigned char *src)
 {
-	memcpy(dst, src, GIT_OID_RAWSZ);
+	memcpy(dst, src, GIT_OID_SHA1_SIZE);
 	return 0;
 }
 
@@ -93,7 +93,7 @@ GIT_INLINE(bool) git_oid__is_hexstr(const char *str)
 			return false;
 	}
 
-	return (i == GIT_OID_HEXSZ);
+	return (i == GIT_OID_SHA1_HEXSIZE);
 }
 
 #endif
diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c
index 1aa6731b3..068231649 100644
--- a/src/libgit2/pack-objects.c
+++ b/src/libgit2/pack-objects.c
@@ -347,8 +347,8 @@ static int write_object(
 		goto done;
 
 	if (type == GIT_OBJECT_REF_DELTA) {
-		if ((error = write_cb(po->delta->id.id, GIT_OID_RAWSZ, cb_data)) < 0 ||
-			(error = git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_RAWSZ)) < 0)
+		if ((error = write_cb(po->delta->id.id, GIT_OID_SHA1_SIZE, cb_data)) < 0 ||
+			(error = git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_SHA1_SIZE)) < 0)
 			goto done;
 	}
 
@@ -668,7 +668,7 @@ static int write_pack(git_packbuilder *pb,
 	if ((error = git_hash_final(entry_oid.id, &pb->ctx)) < 0)
 		goto done;
 
-	error = write_cb(entry_oid.id, GIT_OID_RAWSZ, cb_data);
+	error = write_cb(entry_oid.id, GIT_OID_SHA1_SIZE, cb_data);
 
 done:
 	/* if callback cancelled writing, we must still free delta_data */
diff --git a/src/libgit2/pack.c b/src/libgit2/pack.c
index 16fe378bd..95593743e 100644
--- a/src/libgit2/pack.c
+++ b/src/libgit2/pack.c
@@ -32,7 +32,7 @@ static int packfile_unpack_compressed(
  * Throws GIT_EAMBIGUOUSOIDPREFIX if short oid
  * is ambiguous within the pack.
  * This method assumes that len is between
- * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ.
+ * GIT_OID_MINPREFIXLEN and GIT_OID_SHA1_HEXSIZE.
  */
 static int pack_entry_find_offset(
 		off64_t *offset_out,
@@ -1025,7 +1025,7 @@ int get_delta_base(
 		}
 
 		/* The base entry _must_ be in the same pack */
-		if (pack_entry_find_offset(&base_offset, &unused, p, &base_oid, GIT_OID_HEXSZ) < 0)
+		if (pack_entry_find_offset(&base_offset, &unused, p, &base_oid, GIT_OID_SHA1_HEXSIZE) < 0)
 			return packfile_error("base entry delta is not in the same pack");
 		*curpos += 20;
 	} else
@@ -1083,7 +1083,7 @@ static int packfile_open_locked(struct git_pack_file *p)
 {
 	struct stat st;
 	struct git_pack_header hdr;
-	unsigned char sha1[GIT_OID_RAWSZ];
+	unsigned char sha1[GIT_OID_SHA1_SIZE];
 	unsigned char *idx_sha1;
 
 	if (pack_index_open_locked(p) < 0)
@@ -1131,7 +1131,7 @@ static int packfile_open_locked(struct git_pack_file *p)
 
 	/* Verify the pack matches its index. */
 	if (p->num_objects != ntohl(hdr.hdr_entries) ||
-	    p_pread(p->mwf.fd, sha1, GIT_OID_RAWSZ, p->mwf.size - GIT_OID_RAWSZ) < 0)
+	    p_pread(p->mwf.fd, sha1, GIT_OID_SHA1_SIZE, p->mwf.size - GIT_OID_SHA1_SIZE) < 0)
 		goto cleanup;
 
 	idx_sha1 = ((unsigned char *)p->index_map.data) + p->index_map.len - 40;
@@ -1541,7 +1541,7 @@ static int pack_entry_find_offset(
 		}
 	}
 
-	if (found && len != GIT_OID_HEXSZ && pos + 1 < (int)p->num_objects) {
+	if (found && len != GIT_OID_SHA1_HEXSIZE && pos + 1 < (int)p->num_objects) {
 		/* Check for ambiguousity */
 		const unsigned char *next = current + stride;
 
@@ -1570,9 +1570,9 @@ static int pack_entry_find_offset(
 
 #ifdef INDEX_DEBUG_LOOKUP
 	{
-		unsigned char hex_sha1[GIT_OID_HEXSZ + 1];
+		unsigned char hex_sha1[GIT_OID_SHA1_HEXSIZE + 1];
 		git_oid_fmt(hex_sha1, found_oid);
-		hex_sha1[GIT_OID_HEXSZ] = '\0';
+		hex_sha1[GIT_OID_SHA1_HEXSIZE] = '\0';
 		printf("found lo=%d %s\n", lo, hex_sha1);
 	}
 #endif
@@ -1594,7 +1594,7 @@ int git_pack_entry_find(
 
 	GIT_ASSERT_ARG(p);
 
-	if (len == GIT_OID_HEXSZ && p->num_bad_objects) {
+	if (len == GIT_OID_SHA1_HEXSIZE && p->num_bad_objects) {
 		unsigned i;
 		for (i = 0; i < p->num_bad_objects; i++)
 			if (git_oid__cmp(short_oid, &p->bad_object_sha1[i]) == 0)
diff --git a/src/libgit2/parse.c b/src/libgit2/parse.c
index 0a10758bf..7527b5559 100644
--- a/src/libgit2/parse.c
+++ b/src/libgit2/parse.c
@@ -103,11 +103,11 @@ int git_parse_advance_digit(int64_t *out, git_parse_ctx *ctx, int base)
 
 int git_parse_advance_oid(git_oid *out, git_parse_ctx *ctx)
 {
-	if (ctx->line_len < GIT_OID_HEXSZ)
+	if (ctx->line_len < GIT_OID_SHA1_HEXSIZE)
 		return -1;
-	if ((git_oid_fromstrn(out, ctx->line, GIT_OID_HEXSZ)) < 0)
+	if ((git_oid_fromstrn(out, ctx->line, GIT_OID_SHA1_HEXSIZE)) < 0)
 		return -1;
-	git_parse_advance_chars(ctx, GIT_OID_HEXSZ);
+	git_parse_advance_chars(ctx, GIT_OID_SHA1_HEXSIZE);
 	return 0;
 }
 
diff --git a/src/libgit2/patch_parse.c b/src/libgit2/patch_parse.c
index 78cd96252..0ca1e433d 100644
--- a/src/libgit2/patch_parse.c
+++ b/src/libgit2/patch_parse.c
@@ -168,12 +168,12 @@ static int parse_header_oid(
 {
 	size_t len;
 
-	for (len = 0; len < ctx->parse_ctx.line_len && len < GIT_OID_HEXSZ; len++) {
+	for (len = 0; len < ctx->parse_ctx.line_len && len < GIT_OID_SHA1_HEXSIZE; len++) {
 		if (!git__isxdigit(ctx->parse_ctx.line[len]))
 			break;
 	}
 
-	if (len < GIT_OID_MINPREFIXLEN || len > GIT_OID_HEXSZ ||
+	if (len < GIT_OID_MINPREFIXLEN || len > GIT_OID_SHA1_HEXSIZE ||
 		git_oid_fromstrn(oid, ctx->parse_ctx.line, len) < 0)
 		return git_parse_err("invalid hex formatted object id at line %"PRIuZ,
 			ctx->parse_ctx.line_num);
diff --git a/src/libgit2/rebase.c b/src/libgit2/rebase.c
index 5e48f0dfb..2d835b7ad 100644
--- a/src/libgit2/rebase.c
+++ b/src/libgit2/rebase.c
@@ -181,7 +181,7 @@ GIT_INLINE(int) rebase_readoid(
 	if ((error = rebase_readfile(str_out, state_path, filename)) < 0)
 		return error;
 
-	if (str_out->size != GIT_OID_HEXSZ || git_oid_fromstr(out, str_out->ptr) < 0) {
+	if (str_out->size != GIT_OID_SHA1_HEXSIZE || git_oid_fromstr(out, str_out->ptr) < 0) {
 		git_error_set(GIT_ERROR_REBASE, "the file '%s' contains an invalid object ID", filename);
 		return -1;
 	}
@@ -452,7 +452,7 @@ static const char *rebase_onto_name(const git_annotated_commit *onto)
 static int rebase_setupfiles_merge(git_rebase *rebase)
 {
 	git_str commit_filename = GIT_STR_INIT;
-	char id_str[GIT_OID_HEXSZ];
+	char id_str[GIT_OID_SHA1_HEXSIZE];
 	git_rebase_operation *operation;
 	size_t i;
 	int error = 0;
@@ -470,7 +470,7 @@ static int rebase_setupfiles_merge(git_rebase *rebase)
 		git_oid_fmt(id_str, &operation->id);
 
 		if ((error = rebase_setupfile(rebase, commit_filename.ptr, 0,
-				"%.*s\n", GIT_OID_HEXSZ, id_str)) < 0)
+				"%.*s\n", GIT_OID_SHA1_HEXSIZE, id_str)) < 0)
 			goto done;
 	}
 
@@ -481,7 +481,7 @@ done:
 
 static int rebase_setupfiles(git_rebase *rebase)
 {
-	char onto[GIT_OID_HEXSZ], orig_head[GIT_OID_HEXSZ];
+	char onto[GIT_OID_SHA1_HEXSIZE], orig_head[GIT_OID_SHA1_HEXSIZE];
 	const char *orig_head_name;
 
 	git_oid_fmt(onto, &rebase->onto_id);
@@ -497,8 +497,8 @@ static int rebase_setupfiles(git_rebase *rebase)
 
 	if (git_repository__set_orig_head(rebase->repo, &rebase->orig_head_id) < 0 ||
 		rebase_setupfile(rebase, HEAD_NAME_FILE, 0, "%s\n", orig_head_name) < 0 ||
-		rebase_setupfile(rebase, ONTO_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, onto) < 0 ||
-		rebase_setupfile(rebase, ORIG_HEAD_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, orig_head) < 0 ||
+		rebase_setupfile(rebase, ONTO_FILE, 0, "%.*s\n", GIT_OID_SHA1_HEXSIZE, onto) < 0 ||
+		rebase_setupfile(rebase, ORIG_HEAD_FILE, 0, "%.*s\n", GIT_OID_SHA1_HEXSIZE, orig_head) < 0 ||
 		rebase_setupfile(rebase, QUIET_FILE, 0, rebase->quiet ? "t\n" : "\n") < 0)
 		return -1;
 
@@ -813,7 +813,7 @@ static int rebase_next_merge(
 	git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
 	git_rebase_operation *operation;
 	git_checkout_options checkout_opts;
-	char current_idstr[GIT_OID_HEXSZ];
+	char current_idstr[GIT_OID_SHA1_HEXSIZE];
 	unsigned int parent_count;
 	int error;
 
@@ -842,7 +842,7 @@ static int rebase_next_merge(
 
 	if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 ||
 		(error = rebase_setupfile(rebase, MSGNUM_FILE, 0, "%" PRIuZ "\n", rebase->current+1)) < 0 ||
-		(error = rebase_setupfile(rebase, CURRENT_FILE, 0, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 ||
+		(error = rebase_setupfile(rebase, CURRENT_FILE, 0, "%.*s\n", GIT_OID_SHA1_HEXSIZE, current_idstr)) < 0 ||
 		(error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 ||
 		(error = git_merge__check_result(rebase->repo, index)) < 0 ||
 		(error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 ||
@@ -1102,7 +1102,7 @@ static int rebase_commit_merge(
 	git_reference *head = NULL;
 	git_commit *head_commit = NULL, *commit = NULL;
 	git_index *index = NULL;
-	char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ];
+	char old_idstr[GIT_OID_SHA1_HEXSIZE], new_idstr[GIT_OID_SHA1_HEXSIZE];
 	int error;
 
 	operation = git_array_get(rebase->operations, rebase->current);
@@ -1122,7 +1122,7 @@ static int rebase_commit_merge(
 	git_oid_fmt(new_idstr, git_commit_id(commit));
 
 	if ((error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND,
-		"%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr)) < 0)
+		"%.*s %.*s\n", GIT_OID_SHA1_HEXSIZE, old_idstr, GIT_OID_SHA1_HEXSIZE, new_idstr)) < 0)
 		goto done;
 
 	git_oid_cpy(commit_id, git_commit_id(commit));
@@ -1341,8 +1341,8 @@ static int rebase_copy_notes(
 		tostr = end+1;
 		*end = '\0';
 
-		if (strlen(fromstr) != GIT_OID_HEXSZ ||
-			strlen(tostr) != GIT_OID_HEXSZ ||
+		if (strlen(fromstr) != GIT_OID_SHA1_HEXSIZE ||
+			strlen(tostr) != GIT_OID_SHA1_HEXSIZE ||
 			git_oid_fromstr(&from, fromstr) < 0 ||
 			git_oid_fromstr(&to, tostr) < 0)
 			goto on_error;
@@ -1372,14 +1372,14 @@ static int return_to_orig_head(git_rebase *rebase)
 	git_reference *terminal_ref = NULL, *branch_ref = NULL, *head_ref = NULL;
 	git_commit *terminal_commit = NULL;
 	git_str branch_msg = GIT_STR_INIT, head_msg = GIT_STR_INIT;
-	char onto[GIT_OID_HEXSZ];
+	char onto[GIT_OID_SHA1_HEXSIZE];
 	int error = 0;
 
 	git_oid_fmt(onto, &rebase->onto_id);
 
 	if ((error = git_str_printf(&branch_msg,
 			"rebase finished: %s onto %.*s",
-			rebase->orig_head_name, GIT_OID_HEXSZ, onto)) == 0 &&
+			rebase->orig_head_name, GIT_OID_SHA1_HEXSIZE, onto)) == 0 &&
 		(error = git_str_printf(&head_msg,
 			"rebase finished: returning to %s",
 			rebase->orig_head_name)) == 0 &&
diff --git a/src/libgit2/refdb_fs.c b/src/libgit2/refdb_fs.c
index 0f49b16bb..d7b0da174 100644
--- a/src/libgit2/refdb_fs.c
+++ b/src/libgit2/refdb_fs.c
@@ -160,7 +160,7 @@ static int packed_reload(refdb_fs_backend *backend)
 
 		if (git_oid_fromstr(&oid, scan) < 0)
 			goto parse_failed;
-		scan += GIT_OID_HEXSZ;
+		scan += GIT_OID_SHA1_HEXSIZE;
 
 		if (*scan++ != ' ')
 			goto parse_failed;
@@ -181,7 +181,7 @@ static int packed_reload(refdb_fs_backend *backend)
 		if (*scan == '^') {
 			if (git_oid_fromstr(&oid, scan + 1) < 0)
 				goto parse_failed;
-			scan += GIT_OID_HEXSZ + 1;
+			scan += GIT_OID_SHA1_HEXSIZE + 1;
 
 			if (scan < eof) {
 				if (!(eol = strchr(scan, '\n')))
@@ -218,7 +218,7 @@ static int loose_parse_oid(
 {
 	const char *str = git_str_cstr(file_content);
 
-	if (git_str_len(file_content) < GIT_OID_HEXSZ)
+	if (git_str_len(file_content) < GIT_OID_SHA1_HEXSIZE)
 		goto corrupted;
 
 	/* we need to get 40 OID characters from the file */
@@ -226,7 +226,7 @@ static int loose_parse_oid(
 		goto corrupted;
 
 	/* If the file is longer than 40 chars, the 41st must be a space */
-	str += GIT_OID_HEXSZ;
+	str += GIT_OID_SHA1_HEXSIZE;
 	if (*str == '\0' || git__isspace(*str))
 		return 0;
 
@@ -622,12 +622,12 @@ cmp_record_to_refname(const char *rec, size_t data_end, const char *ref_name)
 	int cmp_val;
 	const char *end;
 
-	rec += GIT_OID_HEXSZ + 1; /* <oid> + space */
-	if (data_end < GIT_OID_HEXSZ + 3) {
+	rec += GIT_OID_SHA1_HEXSIZE + 1; /* <oid> + space */
+	if (data_end < GIT_OID_SHA1_HEXSIZE + 3) {
 		/* an incomplete (corrupt) record is treated as less than ref_name */
 		return -1;
 	}
-	data_end -= GIT_OID_HEXSZ + 1;
+	data_end -= GIT_OID_SHA1_HEXSIZE + 1;
 
 	end = memchr(rec, '\n', data_end);
 	if (end)
@@ -708,11 +708,11 @@ static int packed_lookup(
 			const char *eol;
 			git_oid oid, peel, *peel_ptr = NULL;
 
-			if (data_end - rec < GIT_OID_HEXSZ ||
+			if (data_end - rec < GIT_OID_SHA1_HEXSIZE ||
 			    git_oid_fromstr(&oid, rec) < 0) {
 				goto parse_failed;
 			}
-			rec += GIT_OID_HEXSZ + 1;
+			rec += GIT_OID_SHA1_HEXSIZE + 1;
 			if (!(eol = memchr(rec, '\n', data_end - rec))) {
 				goto parse_failed;
 			}
@@ -724,7 +724,7 @@ static int packed_lookup(
 
 				if (*rec == '^') {
 					rec++;
-					if (data_end - rec < GIT_OID_HEXSZ ||
+					if (data_end - rec < GIT_OID_SHA1_HEXSIZE ||
 						git_oid_fromstr(&peel, rec) < 0) {
 						goto parse_failed;
 					}
@@ -1108,7 +1108,7 @@ static int loose_commit(git_filebuf *file, const git_reference *ref)
 	GIT_ASSERT_ARG(ref);
 
 	if (ref->type == GIT_REFERENCE_DIRECT) {
-		char oid[GIT_OID_HEXSZ + 1];
+		char oid[GIT_OID_SHA1_HEXSIZE + 1];
 		git_oid_nfmt(oid, sizeof(oid), &ref->target.oid);
 
 		git_filebuf_printf(file, "%s\n", oid);
@@ -1224,7 +1224,7 @@ static int packed_find_peel(refdb_fs_backend *backend, struct packref *ref)
  */
 static int packed_write_ref(struct packref *ref, git_filebuf *file)
 {
-	char oid[GIT_OID_HEXSZ + 1];
+	char oid[GIT_OID_SHA1_HEXSIZE + 1];
 	git_oid_nfmt(oid, sizeof(oid), &ref->oid);
 
 	/*
@@ -1238,7 +1238,7 @@ static int packed_write_ref(struct packref *ref, git_filebuf *file)
 	 * The required peels have already been loaded into `ref->peel_target`.
 	 */
 	if (ref->flags & PACKREF_HAS_PEEL) {
-		char peel[GIT_OID_HEXSZ + 1];
+		char peel[GIT_OID_SHA1_HEXSIZE + 1];
 		git_oid_nfmt(peel, sizeof(peel), &ref->peel);
 
 		if (git_filebuf_printf(file, "%s %s\n^%s\n", oid, ref->name, peel) < 0)
@@ -2086,11 +2086,11 @@ static int serialize_reflog_entry(
 	const git_signature *committer,
 	const char *msg)
 {
-	char raw_old[GIT_OID_HEXSZ+1];
-	char raw_new[GIT_OID_HEXSZ+1];
+	char raw_old[GIT_OID_SHA1_HEXSIZE+1];
+	char raw_new[GIT_OID_SHA1_HEXSIZE+1];
 
-	git_oid_tostr(raw_old, GIT_OID_HEXSZ+1, oid_old);
-	git_oid_tostr(raw_new, GIT_OID_HEXSZ+1, oid_new);
+	git_oid_tostr(raw_old, GIT_OID_SHA1_HEXSIZE+1, oid_old);
+	git_oid_tostr(raw_new, GIT_OID_SHA1_HEXSIZE+1, oid_new);
 
 	git_str_clear(buf);
 
diff --git a/src/libgit2/reflog.h b/src/libgit2/reflog.h
index 8c3895952..50d1056ed 100644
--- a/src/libgit2/reflog.h
+++ b/src/libgit2/reflog.h
@@ -16,7 +16,7 @@
 #define GIT_REFLOG_DIR_MODE 0777
 #define GIT_REFLOG_FILE_MODE 0666
 
-#define GIT_REFLOG_SIZE_MIN (2*GIT_OID_HEXSZ+2+17)
+#define GIT_REFLOG_SIZE_MIN (2*GIT_OID_SHA1_HEXSIZE+2+17)
 
 struct git_reflog_entry {
 	git_oid oid_old;
diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
index d2484318f..1312ccce0 100644
--- a/src/libgit2/repository.c
+++ b/src/libgit2/repository.c
@@ -240,7 +240,7 @@ GIT_INLINE(int) validate_repo_path(git_str *path)
 	 */
 	static size_t suffix_len =
 		CONST_STRLEN("objects/pack/pack-.pack.lock") +
-		GIT_OID_HEXSZ;
+		GIT_OID_SHA1_HEXSIZE;
 
 	return git_fs_path_validate_str_length_with_suffix(
 		path, suffix_len);
@@ -2866,14 +2866,14 @@ int git_repository__set_orig_head(git_repository *repo, const git_oid *orig_head
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
 	git_str file_path = GIT_STR_INIT;
-	char orig_head_str[GIT_OID_HEXSZ];
+	char orig_head_str[GIT_OID_SHA1_HEXSIZE];
 	int error = 0;
 
 	git_oid_fmt(orig_head_str, orig_head);
 
 	if ((error = git_str_joinpath(&file_path, repo->gitdir, GIT_ORIG_HEAD_FILE)) == 0 &&
 		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_MERGE_FILE_MODE)) == 0 &&
-		(error = git_filebuf_printf(&file, "%.*s\n", GIT_OID_HEXSZ, orig_head_str)) == 0)
+		(error = git_filebuf_printf(&file, "%.*s\n", GIT_OID_SHA1_HEXSIZE, orig_head_str)) == 0)
 		error = git_filebuf_commit(&file);
 
 	if (error < 0)
diff --git a/src/libgit2/reset.c b/src/libgit2/reset.c
index e0d942e5e..9574819cb 100644
--- a/src/libgit2/reset.c
+++ b/src/libgit2/reset.c
@@ -188,9 +188,9 @@ int git_reset(
 	git_reset_t reset_type,
 	const git_checkout_options *checkout_opts)
 {
-	char to[GIT_OID_HEXSZ + 1];
+	char to[GIT_OID_SHA1_HEXSIZE + 1];
 
-	git_oid_tostr(to, GIT_OID_HEXSZ + 1, git_object_id(target));
+	git_oid_tostr(to, GIT_OID_SHA1_HEXSIZE + 1, git_object_id(target));
 	return reset(repo, target, to, reset_type, checkout_opts);
 }
 
diff --git a/src/libgit2/revert.c b/src/libgit2/revert.c
index d6ab6ae3c..1106dfe2f 100644
--- a/src/libgit2/revert.c
+++ b/src/libgit2/revert.c
@@ -107,10 +107,10 @@ static int revert_state_cleanup(git_repository *repo)
 
 static int revert_seterr(git_commit *commit, const char *fmt)
 {
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_oid_fmt(commit_oidstr, git_commit_id(commit));
-	commit_oidstr[GIT_OID_HEXSZ] = '\0';
+	commit_oidstr[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	git_error_set(GIT_ERROR_REVERT, fmt, commit_oidstr);
 
@@ -176,7 +176,7 @@ int git_revert(
 	git_revert_options opts;
 	git_reference *our_ref = NULL;
 	git_commit *our_commit = NULL;
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 	const char *commit_msg;
 	git_str their_label = GIT_STR_INIT;
 	git_index *index = NULL;
@@ -192,7 +192,7 @@ int git_revert(
 		return error;
 
 	git_oid_fmt(commit_oidstr, git_commit_id(commit));
-	commit_oidstr[GIT_OID_HEXSZ] = '\0';
+	commit_oidstr[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if ((commit_msg = git_commit_summary(commit)) == NULL) {
 		error = -1;
diff --git a/src/libgit2/revparse.c b/src/libgit2/revparse.c
index 9bc28e9fc..3226e28fa 100644
--- a/src/libgit2/revparse.c
+++ b/src/libgit2/revparse.c
@@ -29,7 +29,7 @@ static int maybe_sha(git_object **out, git_repository *repo, const char *spec)
 {
 	size_t speclen = strlen(spec);
 
-	if (speclen != GIT_OID_HEXSZ)
+	if (speclen != GIT_OID_SHA1_HEXSIZE)
 		return GIT_ENOTFOUND;
 
 	return maybe_sha_or_abbrev(out, repo, spec, speclen);
@@ -110,7 +110,7 @@ static int revparse_lookup_object(
 	if (error != GIT_ENOTFOUND)
 		return error;
 
-	if ((strlen(spec) < GIT_OID_HEXSZ) &&
+	if ((strlen(spec) < GIT_OID_SHA1_HEXSIZE) &&
 		((error = maybe_abbrev(object_out, repo, spec)) != GIT_ENOTFOUND))
 			return error;
 
diff --git a/src/libgit2/threadstate.h b/src/libgit2/threadstate.h
index c10f26b59..f9e7ba7bf 100644
--- a/src/libgit2/threadstate.h
+++ b/src/libgit2/threadstate.h
@@ -13,7 +13,7 @@ typedef struct {
 	git_error *last_error;
 	git_error error_t;
 	git_str error_buf;
-	char oid_fmt[GIT_OID_HEXSZ+1];
+	char oid_fmt[GIT_OID_SHA1_HEXSIZE+1];
 } git_threadstate;
 
 extern int git_threadstate_global_init(void);
diff --git a/src/libgit2/transports/smart_pkt.c b/src/libgit2/transports/smart_pkt.c
index b42edd0d6..3b0c34484 100644
--- a/src/libgit2/transports/smart_pkt.c
+++ b/src/libgit2/transports/smart_pkt.c
@@ -53,10 +53,10 @@ static int ack_pkt(git_pkt **out, const char *line, size_t len)
 	line += 4;
 	len -= 4;
 
-	if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->oid, line) < 0)
+	if (len < GIT_OID_SHA1_HEXSIZE || git_oid_fromstr(&pkt->oid, line) < 0)
 		goto out_err;
-	line += GIT_OID_HEXSZ;
-	len -= GIT_OID_HEXSZ;
+	line += GIT_OID_SHA1_HEXSIZE;
+	len -= GIT_OID_SHA1_HEXSIZE;
 
 	if (len && line[0] == ' ') {
 		line++;
@@ -222,10 +222,10 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
 	GIT_ERROR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_REF;
 
-	if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->head.oid, line) < 0)
+	if (len < GIT_OID_SHA1_HEXSIZE || git_oid_fromstr(&pkt->head.oid, line) < 0)
 		goto out_err;
-	line += GIT_OID_HEXSZ;
-	len -= GIT_OID_HEXSZ;
+	line += GIT_OID_SHA1_HEXSIZE;
+	len -= GIT_OID_SHA1_HEXSIZE;
 
 	if (git__prefixncmp(line, len, " "))
 		goto out_err;
@@ -530,7 +530,7 @@ int git_pkt_buffer_flush(git_str *buf)
 static int buffer_want_with_caps(const git_remote_head *head, transport_smart_caps *caps, git_str *buf)
 {
 	git_str str = GIT_STR_INIT;
-	char oid[GIT_OID_HEXSZ +1] = {0};
+	char oid[GIT_OID_SHA1_HEXSIZE +1] = {0};
 	size_t len;
 
 	/* Prefer multi_ack_detailed */
@@ -557,7 +557,7 @@ static int buffer_want_with_caps(const git_remote_head *head, transport_smart_ca
 	if (git_str_oom(&str))
 		return -1;
 
-	len = strlen("XXXXwant ") + GIT_OID_HEXSZ + 1 /* NUL */ +
+	len = strlen("XXXXwant ") + GIT_OID_SHA1_HEXSIZE + 1 /* NUL */ +
 		 git_str_len(&str) + 1 /* LF */;
 
 	if (len > 0xffff) {
@@ -605,7 +605,7 @@ int git_pkt_buffer_wants(
 	}
 
 	for (; i < count; ++i) {
-		char oid[GIT_OID_HEXSZ];
+		char oid[GIT_OID_SHA1_HEXSIZE];
 
 		head = refs[i];
 		if (head->local)
@@ -613,7 +613,7 @@ int git_pkt_buffer_wants(
 
 		git_oid_fmt(oid, &head->oid);
 		git_str_put(buf, pkt_want_prefix, strlen(pkt_want_prefix));
-		git_str_put(buf, oid, GIT_OID_HEXSZ);
+		git_str_put(buf, oid, GIT_OID_SHA1_HEXSIZE);
 		git_str_putc(buf, '\n');
 		if (git_str_oom(buf))
 			return -1;
@@ -624,7 +624,7 @@ int git_pkt_buffer_wants(
 
 int git_pkt_buffer_have(git_oid *oid, git_str *buf)
 {
-	char oidhex[GIT_OID_HEXSZ + 1];
+	char oidhex[GIT_OID_SHA1_HEXSIZE + 1];
 
 	memset(oidhex, 0x0, sizeof(oidhex));
 	git_oid_fmt(oidhex, oid);
diff --git a/src/libgit2/transports/smart_protocol.c b/src/libgit2/transports/smart_protocol.c
index 8cf027133..09778b335 100644
--- a/src/libgit2/transports/smart_protocol.c
+++ b/src/libgit2/transports/smart_protocol.c
@@ -643,12 +643,12 @@ static int gen_pktline(git_str *buf, git_push *push)
 {
 	push_spec *spec;
 	size_t i, len;
-	char old_id[GIT_OID_HEXSZ+1], new_id[GIT_OID_HEXSZ+1];
+	char old_id[GIT_OID_SHA1_HEXSIZE+1], new_id[GIT_OID_SHA1_HEXSIZE+1];
 
-	old_id[GIT_OID_HEXSZ] = '\0'; new_id[GIT_OID_HEXSZ] = '\0';
+	old_id[GIT_OID_SHA1_HEXSIZE] = '\0'; new_id[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	git_vector_foreach(&push->specs, i, spec) {
-		len = 2*GIT_OID_HEXSZ + 7 + strlen(spec->refspec.dst);
+		len = 2*GIT_OID_SHA1_HEXSIZE + 7 + strlen(spec->refspec.dst);
 
 		if (i == 0) {
 			++len; /* '\0' */
@@ -1020,7 +1020,7 @@ int git_smart__push(git_transport *transport, git_push *push)
 #ifdef PUSH_DEBUG
 {
 	git_remote_head *head;
-	char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0';
+	char hex[GIT_OID_SHA1_HEXSIZE+1]; hex[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	git_vector_foreach(&push->remote->refs, i, head) {
 		git_oid_fmt(hex, &head->oid);
diff --git a/src/libgit2/tree-cache.c b/src/libgit2/tree-cache.c
index cd69e7bf8..966e7df31 100644
--- a/src/libgit2/tree-cache.c
+++ b/src/libgit2/tree-cache.c
@@ -111,11 +111,11 @@ static int read_tree_internal(git_tree_cache **out,
 	/* The SHA1 is only there if it's not invalidated */
 	if (tree->entry_count >= 0) {
 		/* 160-bit SHA-1 for this tree and it's children */
-		if (buffer + GIT_OID_RAWSZ > buffer_end)
+		if (buffer + GIT_OID_SHA1_SIZE > buffer_end)
 			goto corrupted;
 
 		git_oid_fromraw(&tree->oid, (const unsigned char *)buffer);
-		buffer += GIT_OID_RAWSZ;
+		buffer += GIT_OID_SHA1_SIZE;
 	}
 
 	/* Parse children: */
@@ -263,7 +263,7 @@ static void write_tree(git_str *out, git_tree_cache *tree)
 	git_str_printf(out, "%s%c%"PRIdZ" %"PRIuZ"\n", tree->name, 0, tree->entry_count, tree->children_count);
 
 	if (tree->entry_count != -1)
-		git_str_put(out, (char *)&tree->oid.id, GIT_OID_RAWSZ);
+		git_str_put(out, (char *)&tree->oid.id, GIT_OID_SHA1_SIZE);
 
 	for (i = 0; i < tree->children_count; i++)
 		write_tree(out, tree->children[i]);
diff --git a/src/libgit2/tree.c b/src/libgit2/tree.c
index a5371fd87..9d3c67db0 100644
--- a/src/libgit2/tree.c
+++ b/src/libgit2/tree.c
@@ -89,7 +89,7 @@ static git_tree_entry *alloc_entry(const char *filename, size_t filename_len, co
 
 	if (GIT_ADD_SIZET_OVERFLOW(&tree_len, sizeof(git_tree_entry), filename_len) ||
 	    GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, 1) ||
-	    GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, GIT_OID_RAWSZ))
+	    GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, GIT_OID_SHA1_SIZE))
 		return NULL;
 
 	entry = git__calloc(1, tree_len);
@@ -414,7 +414,7 @@ int git_tree__parse_raw(void *_tree, const char *data, size_t size)
 		if ((filename_len = nul - buffer) == 0 || filename_len > UINT16_MAX)
 			return tree_parse_error("failed to parse tree: can't parse filename", NULL);
 
-		if ((buffer_end - (nul + 1)) < GIT_OID_RAWSZ)
+		if ((buffer_end - (nul + 1)) < GIT_OID_SHA1_SIZE)
 			return tree_parse_error("failed to parse tree: can't parse OID", NULL);
 
 		/* Allocate the entry */
@@ -429,7 +429,7 @@ int git_tree__parse_raw(void *_tree, const char *data, size_t size)
 		}
 
 		buffer += filename_len + 1;
-		buffer += GIT_OID_RAWSZ;
+		buffer += GIT_OID_SHA1_SIZE;
 	}
 
 	return 0;
@@ -529,7 +529,7 @@ static int git_treebuilder__write_with_buffer(
 
 		git_str_printf(buf, "%o ", entry->attr);
 		git_str_put(buf, entry->filename, entry->filename_len + 1);
-		git_str_put(buf, (char *)entry->oid.id, GIT_OID_RAWSZ);
+		git_str_put(buf, (char *)entry->oid.id, GIT_OID_SHA1_SIZE);
 
 		if (git_str_oom(buf)) {
 			error = -1;
diff --git a/tests/libgit2/blame/blame_helpers.c b/tests/libgit2/blame/blame_helpers.c
index 6b3ce677d..8aeaa5886 100644
--- a/tests/libgit2/blame/blame_helpers.c
+++ b/tests/libgit2/blame/blame_helpers.c
@@ -17,7 +17,7 @@ void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...)
 void check_blame_hunk_index(git_repository *repo, git_blame *blame, int idx,
 		size_t start_line, size_t len, char boundary, const char *commit_id, const char *orig_path)
 {
-	char expected[GIT_OID_HEXSZ+1] = {0}, actual[GIT_OID_HEXSZ+1] = {0};
+	char expected[GIT_OID_SHA1_HEXSIZE+1] = {0}, actual[GIT_OID_SHA1_HEXSIZE+1] = {0};
 	const git_blame_hunk *hunk = git_blame_get_hunk_byindex(blame, idx);
 	cl_assert(hunk);
 
diff --git a/tests/libgit2/checkout/conflict.c b/tests/libgit2/checkout/conflict.c
index 4a9e4b9fa..30838940e 100644
--- a/tests/libgit2/checkout/conflict.c
+++ b/tests/libgit2/checkout/conflict.c
@@ -49,7 +49,7 @@ static git_index *g_index;
 
 struct checkout_index_entry {
 	uint16_t mode;
-	char oid_str[GIT_OID_HEXSZ+1];
+	char oid_str[GIT_OID_SHA1_HEXSIZE+1];
 	int stage;
 	char path[128];
 };
diff --git a/tests/libgit2/core/oidmap.c b/tests/libgit2/core/oidmap.c
index 7f98287a6..6854e3432 100644
--- a/tests/libgit2/core/oidmap.c
+++ b/tests/libgit2/core/oidmap.c
@@ -17,7 +17,7 @@ void test_core_oidmap__initialize(void)
 
 		test_oids[i].extra = i;
 
-		for (j = 0; j < GIT_OID_RAWSZ / 4; ++j) {
+		for (j = 0; j < GIT_OID_SHA1_SIZE / 4; ++j) {
 			test_oids[i].oid.id[j * 4    ] = (unsigned char)modi;
 			test_oids[i].oid.id[j * 4 + 1] = (unsigned char)(modi >> 8);
 			test_oids[i].oid.id[j * 4 + 2] = (unsigned char)(modi >> 16);
diff --git a/tests/libgit2/core/pool.c b/tests/libgit2/core/pool.c
index 5746e35b8..af132132a 100644
--- a/tests/libgit2/core/pool.c
+++ b/tests/libgit2/core/pool.c
@@ -7,7 +7,7 @@ static char to_hex[] = "0123456789abcdef";
 void test_core_pool__oid(void)
 {
 	git_pool p;
-	char oid_hex[GIT_OID_HEXSZ];
+	char oid_hex[GIT_OID_SHA1_HEXSIZE];
 	git_oid *oid;
 	int i, j;
 
diff --git a/tests/libgit2/diff/binary.c b/tests/libgit2/diff/binary.c
index 4e71f39c6..284a1b1af 100644
--- a/tests/libgit2/diff/binary.c
+++ b/tests/libgit2/diff/binary.c
@@ -100,7 +100,7 @@ void test_diff_binary__add(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("diff_format_email");
 	test_patch(
@@ -183,7 +183,7 @@ void test_diff_binary__delete(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("diff_format_email");
 	test_patch(
@@ -215,7 +215,7 @@ void test_diff_binary__delta(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 	cl_git_pass(git_repository_index(&index, repo));
@@ -257,7 +257,7 @@ void test_diff_binary__delta_append(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 	cl_git_pass(git_repository_index(&index, repo));
@@ -285,7 +285,7 @@ void test_diff_binary__empty_for_no_diff(void)
 	git_str actual = GIT_STR_INIT;
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 
@@ -323,7 +323,7 @@ void test_diff_binary__index_to_workdir(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 	cl_git_pass(git_repository_index(&index, repo));
@@ -389,7 +389,7 @@ void test_diff_binary__print_patch_from_diff(void)
 		"\n";
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 	cl_git_pass(git_repository_index(&index, repo));
@@ -501,7 +501,7 @@ void test_diff_binary__blob_to_blob(void)
 	struct diff_data diff_data = {0};
 
 	opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY;
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 
 	repo = cl_git_sandbox_init("renames");
 	cl_git_pass(git_repository_index__weakptr(&index, repo));
diff --git a/tests/libgit2/diff/parse.c b/tests/libgit2/diff/parse.c
index 9c3f798e4..cae843cc8 100644
--- a/tests/libgit2/diff/parse.c
+++ b/tests/libgit2/diff/parse.c
@@ -151,7 +151,7 @@ static void test_tree_to_tree_computed_to_parsed(
 
 	repo = cl_git_sandbox_init(sandbox);
 
-	opts.id_abbrev = GIT_OID_HEXSZ;
+	opts.id_abbrev = GIT_OID_SHA1_HEXSIZE;
 	opts.flags = GIT_DIFF_SHOW_BINARY | diff_flags;
 	findopts.flags = find_flags;
 
diff --git a/tests/libgit2/graph/commitgraph.c b/tests/libgit2/graph/commitgraph.c
index 7607c35a3..850f1947c 100644
--- a/tests/libgit2/graph/commitgraph.c
+++ b/tests/libgit2/graph/commitgraph.c
@@ -20,7 +20,7 @@ void test_graph_commitgraph__parse(void)
 	cl_assert_equal_i(git_commit_graph_file_needs_refresh(file, git_str_cstr(&commit_graph_path)), 0);
 
 	cl_git_pass(git_oid_fromstr(&id, "5001298e0c09ad9c34e4249bc5801c75e9754fa5"));
-	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_HEXSZ));
+	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_SHA1_HEXSIZE));
 	cl_assert_equal_oid(&e.sha1, &id);
 	cl_git_pass(git_oid_fromstr(&id, "418382dff1ffb8bdfba833f4d8bbcde58b1e7f47"));
 	cl_assert_equal_oid(&e.tree_oid, &id);
@@ -29,7 +29,7 @@ void test_graph_commitgraph__parse(void)
 	cl_assert_equal_i(e.parent_count, 0);
 
 	cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"));
-	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_HEXSZ));
+	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_SHA1_HEXSIZE));
 	cl_assert_equal_oid(&e.sha1, &id);
 	cl_assert_equal_i(e.generation, 5);
 	cl_assert_equal_i(e.commit_time, UINT64_C(1274813907));
@@ -63,7 +63,7 @@ void test_graph_commitgraph__parse_octopus_merge(void)
 	cl_git_pass(git_commit_graph_file_open(&file, git_str_cstr(&commit_graph_path)));
 
 	cl_git_pass(git_oid_fromstr(&id, "d71c24b3b113fd1d1909998c5bfe33b86a65ee03"));
-	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_HEXSZ));
+	cl_git_pass(git_commit_graph_entry_find(&e, file, &id, GIT_OID_SHA1_HEXSIZE));
 	cl_assert_equal_oid(&e.sha1, &id);
 	cl_git_pass(git_oid_fromstr(&id, "348f16ffaeb73f319a75cec5b16a0a47d2d5e27c"));
 	cl_assert_equal_oid(&e.tree_oid, &id);
diff --git a/tests/libgit2/merge/merge_helpers.h b/tests/libgit2/merge/merge_helpers.h
index 339812ba5..72c6e61f7 100644
--- a/tests/libgit2/merge/merge_helpers.h
+++ b/tests/libgit2/merge/merge_helpers.h
@@ -6,7 +6,7 @@
 
 struct merge_index_entry {
 	uint16_t mode;
-	char oid_str[GIT_OID_HEXSZ+1];
+	char oid_str[GIT_OID_SHA1_HEXSIZE+1];
 	int stage;
 	char path[128];
 };
@@ -27,9 +27,9 @@ struct merge_reuc_entry {
 	unsigned int ancestor_mode;
 	unsigned int our_mode;
 	unsigned int their_mode;
-	char ancestor_oid_str[GIT_OID_HEXSZ+1];
-	char our_oid_str[GIT_OID_HEXSZ+1];
-	char their_oid_str[GIT_OID_HEXSZ+1];
+	char ancestor_oid_str[GIT_OID_SHA1_HEXSIZE+1];
+	char our_oid_str[GIT_OID_SHA1_HEXSIZE+1];
+	char their_oid_str[GIT_OID_SHA1_HEXSIZE+1];
 };
 
 struct merge_index_conflict_data {
diff --git a/tests/libgit2/network/remote/rename.c b/tests/libgit2/network/remote/rename.c
index 1fd2affba..d4446b8aa 100644
--- a/tests/libgit2/network/remote/rename.c
+++ b/tests/libgit2/network/remote/rename.c
@@ -164,7 +164,7 @@ void test_network_remote_rename__renaming_a_remote_moves_the_underlying_referenc
 void test_network_remote_rename__overwrite_ref_in_target(void)
 {
 	git_oid id;
-	char idstr[GIT_OID_HEXSZ + 1] = {0};
+	char idstr[GIT_OID_SHA1_HEXSIZE + 1] = {0};
 	git_reference *ref;
 	git_branch_t btype;
 	git_branch_iterator *iter;
@@ -206,7 +206,7 @@ void test_network_remote_rename__symref_head(void)
 	git_branch_t btype;
 	git_branch_iterator *iter;
 	git_strarray problems = {0};
-	char idstr[GIT_OID_HEXSZ + 1] = {0};
+	char idstr[GIT_OID_SHA1_HEXSIZE + 1] = {0};
 	git_vector refs;
 
 	cl_git_pass(git_reference_symbolic_create(&ref, _repo, "refs/remotes/test/HEAD", "refs/remotes/test/master", 0, NULL));
diff --git a/tests/libgit2/object/raw/compare.c b/tests/libgit2/object/raw/compare.c
index 56c016b72..9369bc21f 100644
--- a/tests/libgit2/object/raw/compare.c
+++ b/tests/libgit2/object/raw/compare.c
@@ -76,17 +76,17 @@ void test_object_raw_compare__compare_fmt_oids(void)
 {
 	const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0";
 	git_oid in;
-	char out[GIT_OID_HEXSZ + 1];
+	char out[GIT_OID_SHA1_HEXSIZE + 1];
 
 	cl_git_pass(git_oid_fromstr(&in, exp));
 
 	/* Format doesn't touch the last byte */
-	out[GIT_OID_HEXSZ] = 'Z';
+	out[GIT_OID_SHA1_HEXSIZE] = 'Z';
 	git_oid_fmt(out, &in);
-	cl_assert(out[GIT_OID_HEXSZ] == 'Z');
+	cl_assert(out[GIT_OID_SHA1_HEXSIZE] == 'Z');
 
 	/* Format produced the right result */
-	out[GIT_OID_HEXSZ] = '\0';
+	out[GIT_OID_SHA1_HEXSIZE] = '\0';
 	cl_assert_equal_s(exp, out);
 }
 
@@ -108,16 +108,16 @@ void test_object_raw_compare__compare_pathfmt_oids(void)
 	const char *exp1 = "16a0123456789abcdef4b775213c23a8bd74f5e0";
 	const char *exp2 = "16/a0123456789abcdef4b775213c23a8bd74f5e0";
 	git_oid in;
-	char out[GIT_OID_HEXSZ + 2];
+	char out[GIT_OID_SHA1_HEXSIZE + 2];
 
 	cl_git_pass(git_oid_fromstr(&in, exp1));
 
 	/* Format doesn't touch the last byte */
-	out[GIT_OID_HEXSZ + 1] = 'Z';
+	out[GIT_OID_SHA1_HEXSIZE + 1] = 'Z';
 	git_oid_pathfmt(out, &in);
-	cl_assert(out[GIT_OID_HEXSZ + 1] == 'Z');
+	cl_assert(out[GIT_OID_SHA1_HEXSIZE + 1] == 'Z');
 
 	/* Format produced the right result */
-	out[GIT_OID_HEXSZ + 1] = '\0';
+	out[GIT_OID_SHA1_HEXSIZE + 1] = '\0';
 	cl_assert_equal_s(exp2, out);
 }
diff --git a/tests/libgit2/object/raw/convert.c b/tests/libgit2/object/raw/convert.c
index 40a01ae09..ebf2bb8e4 100644
--- a/tests/libgit2/object/raw/convert.c
+++ b/tests/libgit2/object/raw/convert.c
@@ -7,7 +7,7 @@ void test_object_raw_convert__succeed_on_oid_to_string_conversion(void)
 {
 	const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0";
 	git_oid in;
-	char out[GIT_OID_HEXSZ + 1];
+	char out[GIT_OID_SHA1_HEXSIZE + 1];
 	char *str;
 	int i;
 
@@ -29,7 +29,7 @@ void test_object_raw_convert__succeed_on_oid_to_string_conversion(void)
 	str = git_oid_tostr(out, 1, &in);
 	cl_assert(str && *str == '\0' && str == out);
 
-	for (i = 1; i < GIT_OID_HEXSZ; i++) {
+	for (i = 1; i < GIT_OID_SHA1_HEXSIZE; i++) {
 		out[i+1] = 'Z';
 		str = git_oid_tostr(out, i+1, &in);
 		/* returns out containing c-string */
@@ -44,7 +44,7 @@ void test_object_raw_convert__succeed_on_oid_to_string_conversion(void)
 
 	/* returns out as hex formatted c-string */
 	str = git_oid_tostr(out, sizeof(out), &in);
-	cl_assert(str && str == out && *(str+GIT_OID_HEXSZ) == '\0');
+	cl_assert(str && str == out && *(str+GIT_OID_SHA1_HEXSIZE) == '\0');
 	cl_assert_equal_s(exp, out);
 }
 
@@ -52,26 +52,26 @@ void test_object_raw_convert__succeed_on_oid_to_string_conversion_big(void)
 {
 	const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0";
 	git_oid in;
-	char big[GIT_OID_HEXSZ + 1 + 3]; /* note + 4 => big buffer */
+	char big[GIT_OID_SHA1_HEXSIZE + 1 + 3]; /* note + 4 => big buffer */
 	char *str;
 
 	cl_git_pass(git_oid_fromstr(&in, exp));
 
 	/* place some tail material */
-	big[GIT_OID_HEXSZ+0] = 'W'; /* should be '\0' afterwards */
-	big[GIT_OID_HEXSZ+1] = 'X'; /* should remain untouched   */
-	big[GIT_OID_HEXSZ+2] = 'Y'; /* ditto */
-	big[GIT_OID_HEXSZ+3] = 'Z'; /* ditto */
+	big[GIT_OID_SHA1_HEXSIZE+0] = 'W'; /* should be '\0' afterwards */
+	big[GIT_OID_SHA1_HEXSIZE+1] = 'X'; /* should remain untouched   */
+	big[GIT_OID_SHA1_HEXSIZE+2] = 'Y'; /* ditto */
+	big[GIT_OID_SHA1_HEXSIZE+3] = 'Z'; /* ditto */
 
 	/* returns big as hex formatted c-string */
 	str = git_oid_tostr(big, sizeof(big), &in);
-	cl_assert(str && str == big && *(str+GIT_OID_HEXSZ) == '\0');
+	cl_assert(str && str == big && *(str+GIT_OID_SHA1_HEXSIZE) == '\0');
 	cl_assert_equal_s(exp, big);
 
 	/* check tail material is untouched */
-	cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+1) == 'X');
-	cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+2) == 'Y');
-	cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+3) == 'Z');
+	cl_assert(str && str == big && *(str+GIT_OID_SHA1_HEXSIZE+1) == 'X');
+	cl_assert(str && str == big && *(str+GIT_OID_SHA1_HEXSIZE+2) == 'Y');
+	cl_assert(str && str == big && *(str+GIT_OID_SHA1_HEXSIZE+3) == 'Z');
 }
 
 static void check_partial_oid(
@@ -86,14 +86,14 @@ void test_object_raw_convert__convert_oid_partially(void)
 {
 	const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0";
 	git_oid in;
-	char big[GIT_OID_HEXSZ + 1 + 3]; /* note + 4 => big buffer */
+	char big[GIT_OID_SHA1_HEXSIZE + 1 + 3]; /* note + 4 => big buffer */
 
 	cl_git_pass(git_oid_fromstr(&in, exp));
 
 	git_oid_nfmt(big, sizeof(big), &in);
 	cl_assert_equal_s(exp, big);
 
-	git_oid_nfmt(big, GIT_OID_HEXSZ + 1, &in);
+	git_oid_nfmt(big, GIT_OID_SHA1_HEXSIZE + 1, &in);
 	cl_assert_equal_s(exp, big);
 
 	check_partial_oid(big, 1, &in, "1");
@@ -102,11 +102,11 @@ void test_object_raw_convert__convert_oid_partially(void)
 	check_partial_oid(big, 4, &in, "16a0");
 	check_partial_oid(big, 5, &in, "16a01");
 
-	check_partial_oid(big, GIT_OID_HEXSZ, &in, exp);
+	check_partial_oid(big, GIT_OID_SHA1_HEXSIZE, &in, exp);
 	check_partial_oid(
-		big, GIT_OID_HEXSZ - 1, &in, "16a0123456789abcdef4b775213c23a8bd74f5e");
+		big, GIT_OID_SHA1_HEXSIZE - 1, &in, "16a0123456789abcdef4b775213c23a8bd74f5e");
 	check_partial_oid(
-		big, GIT_OID_HEXSZ - 2, &in, "16a0123456789abcdef4b775213c23a8bd74f5");
+		big, GIT_OID_SHA1_HEXSIZE - 2, &in, "16a0123456789abcdef4b775213c23a8bd74f5");
 	check_partial_oid(
-		big, GIT_OID_HEXSZ - 3, &in, "16a0123456789abcdef4b775213c23a8bd74f");
+		big, GIT_OID_SHA1_HEXSIZE - 3, &in, "16a0123456789abcdef4b775213c23a8bd74f");
 }
diff --git a/tests/libgit2/object/raw/short.c b/tests/libgit2/object/raw/short.c
index cc2b5f62a..102526844 100644
--- a/tests/libgit2/object/raw/short.c
+++ b/tests/libgit2/object/raw/short.c
@@ -17,7 +17,7 @@ void test_object_raw_short__oid_shortener_no_duplicates(void)
 	git_oid_shorten_add(os, "16a0123456789abcdef4b775213c23a8bd74f5e0");
 	min_len = git_oid_shorten_add(os, "ce08fe4884650f067bd5703b6a59a8b3b3c99a09");
 
-	cl_assert(min_len == GIT_OID_HEXSZ + 1);
+	cl_assert(min_len == GIT_OID_SHA1_HEXSIZE + 1);
 
 	git_oid_shorten_free(os);
 }
@@ -38,9 +38,9 @@ static int insert_sequential_oids(
 
 		git_oid_fromraw(&oid, hashbuf);
 
-		oids[i] = git__malloc(GIT_OID_HEXSZ + 1);
+		oids[i] = git__malloc(GIT_OID_SHA1_HEXSIZE + 1);
 		cl_assert(oids[i]);
-		git_oid_nfmt(oids[i], GIT_OID_HEXSZ + 1, &oid);
+		git_oid_nfmt(oids[i], GIT_OID_SHA1_HEXSIZE + 1, &oid);
 
 		min_len = git_oid_shorten_add(os, oids[i]);
 
diff --git a/tests/libgit2/object/raw/size.c b/tests/libgit2/object/raw/size.c
index 930c6de23..ab6b1ffdf 100644
--- a/tests/libgit2/object/raw/size.c
+++ b/tests/libgit2/object/raw/size.c
@@ -6,8 +6,8 @@
 void test_object_raw_size__validate_oid_size(void)
 {
 	git_oid out;
-	cl_assert(20 == GIT_OID_RAWSZ);
-	cl_assert(40 == GIT_OID_HEXSZ);
-	cl_assert(sizeof(out) == GIT_OID_RAWSZ);
-	cl_assert(sizeof(out.id) == GIT_OID_RAWSZ);
+
+	cl_assert(20 == GIT_OID_SHA1_SIZE);
+	cl_assert(40 == GIT_OID_SHA1_HEXSIZE);
+	cl_assert(sizeof(out.id) == GIT_OID_SHA1_SIZE);
 }
diff --git a/tests/libgit2/odb/backend/backend_helpers.c b/tests/libgit2/odb/backend/backend_helpers.c
index 542799242..c595e4744 100644
--- a/tests/libgit2/odb/backend/backend_helpers.c
+++ b/tests/libgit2/odb/backend/backend_helpers.c
@@ -34,7 +34,7 @@ static int fake_backend__exists(git_odb_backend *backend, const git_oid *oid)
 
 	fake->exists_calls++;
 
-	return search_object(NULL, fake, oid, GIT_OID_HEXSZ) == GIT_OK;
+	return search_object(NULL, fake, oid, GIT_OID_SHA1_HEXSIZE) == GIT_OK;
 }
 
 static int fake_backend__exists_prefix(
@@ -69,7 +69,7 @@ static int fake_backend__read(
 
 	fake->read_calls++;
 
-	if ((error = search_object(&obj, fake, oid, GIT_OID_HEXSZ)) < 0)
+	if ((error = search_object(&obj, fake, oid, GIT_OID_SHA1_HEXSIZE)) < 0)
 		return error;
 
 	*len_p = strlen(obj->content);
@@ -91,7 +91,7 @@ static int fake_backend__read_header(
 
 	fake->read_header_calls++;
 
-	if ((error = search_object(&obj, fake, oid, GIT_OID_HEXSZ)) < 0)
+	if ((error = search_object(&obj, fake, oid, GIT_OID_SHA1_HEXSIZE)) < 0)
 		return error;
 
 	*len_p = strlen(obj->content);
diff --git a/tests/libgit2/odb/mixed.c b/tests/libgit2/odb/mixed.c
index 87e945c83..cbab8e362 100644
--- a/tests/libgit2/odb/mixed.c
+++ b/tests/libgit2/odb/mixed.c
@@ -21,10 +21,10 @@ void test_odb_mixed__dup_oid(void) {
 	git_odb_object *obj;
 
 	cl_git_pass(git_oid_fromstr(&oid, hex));
-	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, GIT_OID_HEXSZ));
+	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, GIT_OID_SHA1_HEXSIZE));
 	git_odb_object_free(obj);
 
-	cl_git_pass(git_odb_exists_prefix(NULL, _odb, &oid, GIT_OID_HEXSZ));
+	cl_git_pass(git_odb_exists_prefix(NULL, _odb, &oid, GIT_OID_SHA1_HEXSIZE));
 
 	cl_git_pass(git_oid_fromstrn(&oid, short_hex, sizeof(short_hex) - 1));
 	cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, sizeof(short_hex) - 1));
@@ -192,7 +192,7 @@ static void assert_found_objects(git_odb_expand_id *ids)
 
 		if (expand_id_test_data[i].expected_id) {
 			git_oid_fromstr(&expected_id, expand_id_test_data[i].expected_id);
-			expected_len = GIT_OID_HEXSZ;
+			expected_len = GIT_OID_SHA1_HEXSIZE;
 			expected_type = expand_id_test_data[i].expected_type;
 		}
 
diff --git a/tests/libgit2/pack/midx.c b/tests/libgit2/pack/midx.c
index 9dd949363..2a5c5a328 100644
--- a/tests/libgit2/pack/midx.c
+++ b/tests/libgit2/pack/midx.c
@@ -20,7 +20,7 @@ void test_pack_midx__parse(void)
 	cl_assert_equal_i(git_midx_needs_refresh(idx, git_str_cstr(&midx_path)), 0);
 
 	cl_git_pass(git_oid_fromstr(&id, "5001298e0c09ad9c34e4249bc5801c75e9754fa5"));
-	cl_git_pass(git_midx_entry_find(&e, idx, &id, GIT_OID_HEXSZ));
+	cl_git_pass(git_midx_entry_find(&e, idx, &id, GIT_OID_SHA1_HEXSIZE));
 	cl_assert_equal_oid(&e.sha1, &id);
 	cl_assert_equal_s(
 			(const char *)git_vector_get(&idx->packfile_names, e.pack_index),
@@ -40,7 +40,7 @@ void test_pack_midx__lookup(void)
 	cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
 
 	cl_git_pass(git_oid_fromstr(&id, "5001298e0c09ad9c34e4249bc5801c75e9754fa5"));
-	cl_git_pass(git_commit_lookup_prefix(&commit, repo, &id, GIT_OID_HEXSZ));
+	cl_git_pass(git_commit_lookup_prefix(&commit, repo, &id, GIT_OID_SHA1_HEXSIZE));
 	cl_assert_equal_s(git_commit_message(commit), "packed commit one\n");
 
 	git_commit_free(commit);
diff --git a/tests/libgit2/patch/parse.c b/tests/libgit2/patch/parse.c
index a3c4c6730..d90576e46 100644
--- a/tests/libgit2/patch/parse.c
+++ b/tests/libgit2/patch/parse.c
@@ -7,7 +7,7 @@
 static void ensure_patch_validity(git_patch *patch)
 {
 	const git_diff_delta *delta;
-	char idstr[GIT_OID_HEXSZ+1] = {0};
+	char idstr[GIT_OID_SHA1_HEXSIZE+1] = {0};
 
 	cl_assert((delta = git_patch_get_delta(patch)) != NULL);
 	cl_assert_equal_i(2, delta->nfiles);
diff --git a/tests/libgit2/refs/reflog/reflog_helpers.c b/tests/libgit2/refs/reflog/reflog_helpers.c
index 2ea41ee06..f62d27edd 100644
--- a/tests/libgit2/refs/reflog/reflog_helpers.c
+++ b/tests/libgit2/refs/reflog/reflog_helpers.c
@@ -6,12 +6,12 @@
 
 int reflog_entry_tostr(git_str *out, const git_reflog_entry *entry)
 {
-	char old_oid[GIT_OID_HEXSZ], new_oid[GIT_OID_HEXSZ];
+	char old_oid[GIT_OID_SHA1_HEXSIZE], new_oid[GIT_OID_SHA1_HEXSIZE];
 
 	assert(out && entry);
 
-	git_oid_tostr((char *)&old_oid, GIT_OID_HEXSZ, git_reflog_entry_id_old(entry));
-	git_oid_tostr((char *)&new_oid, GIT_OID_HEXSZ, git_reflog_entry_id_new(entry));
+	git_oid_tostr((char *)&old_oid, GIT_OID_SHA1_HEXSIZE, git_reflog_entry_id_old(entry));
+	git_oid_tostr((char *)&new_oid, GIT_OID_SHA1_HEXSIZE, git_reflog_entry_id_new(entry));
 
 	return git_str_printf(out, "%s %s %s %s", old_oid, new_oid, "somesig", git_reflog_entry_message(entry));
 }
diff --git a/tests/libgit2/refs/revparse.c b/tests/libgit2/refs/revparse.c
index 56af3c939..02ffe005d 100644
--- a/tests/libgit2/refs/revparse.c
+++ b/tests/libgit2/refs/revparse.c
@@ -652,7 +652,7 @@ void test_refs_revparse__try_to_retrieve_branch_before_described_tag(void)
 	git_repository *repo;
 	git_reference *branch;
 	git_object *target;
-	char sha[GIT_OID_HEXSZ + 1];
+	char sha[GIT_OID_SHA1_HEXSIZE + 1];
 
 	repo = cl_git_sandbox_init("testrepo.git");
 
@@ -661,7 +661,7 @@ void test_refs_revparse__try_to_retrieve_branch_before_described_tag(void)
 	cl_git_pass(git_revparse_single(&target, repo, "HEAD~3"));
 	cl_git_pass(git_branch_create(&branch, repo, "blah-7-gc47800c", (git_commit *)target, 0));
 
-	git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target));
+	git_oid_tostr(sha, GIT_OID_SHA1_HEXSIZE + 1, git_object_id(target));
 
 	test_object_inrepo("blah-7-gc47800c", sha, repo);
 
@@ -690,7 +690,7 @@ void test_refs_revparse__try_to_retrieve_sha_before_branch(void)
 	git_repository *repo;
 	git_reference *branch;
 	git_object *target;
-	char sha[GIT_OID_HEXSZ + 1];
+	char sha[GIT_OID_SHA1_HEXSIZE + 1];
 
 	repo = cl_git_sandbox_init("testrepo.git");
 
@@ -699,7 +699,7 @@ void test_refs_revparse__try_to_retrieve_sha_before_branch(void)
 	cl_git_pass(git_revparse_single(&target, repo, "HEAD~3"));
 	cl_git_pass(git_branch_create(&branch, repo, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", (git_commit *)target, 0));
 
-	git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target));
+	git_oid_tostr(sha, GIT_OID_SHA1_HEXSIZE + 1, git_object_id(target));
 
 	test_object_inrepo("a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo);
 	test_object_inrepo("heads/a65fedf39aefe402d3bb6e24df4d4f5fe4547750", sha, repo);
@@ -726,7 +726,7 @@ void test_refs_revparse__try_to_retrieve_branch_before_abbrev_sha(void)
 	git_repository *repo;
 	git_reference *branch;
 	git_object *target;
-	char sha[GIT_OID_HEXSZ + 1];
+	char sha[GIT_OID_SHA1_HEXSIZE + 1];
 
 	repo = cl_git_sandbox_init("testrepo.git");
 
@@ -735,7 +735,7 @@ void test_refs_revparse__try_to_retrieve_branch_before_abbrev_sha(void)
 	cl_git_pass(git_revparse_single(&target, repo, "HEAD~3"));
 	cl_git_pass(git_branch_create(&branch, repo, "c47800", (git_commit *)target, 0));
 
-	git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target));
+	git_oid_tostr(sha, GIT_OID_SHA1_HEXSIZE + 1, git_object_id(target));
 
 	test_object_inrepo("c47800", sha, repo);
 
diff --git a/tests/libgit2/repo/init.c b/tests/libgit2/repo/init.c
index 7cf6742ca..adcd9e025 100644
--- a/tests/libgit2/repo/init.c
+++ b/tests/libgit2/repo/init.c
@@ -708,7 +708,7 @@ void test_repo_init__defaultbranch_config_empty(void)
 void test_repo_init__longpath(void)
 {
 #ifdef GIT_WIN32
-	size_t padding = CONST_STRLEN("objects/pack/pack-.pack.lock") + GIT_OID_HEXSZ;
+	size_t padding = CONST_STRLEN("objects/pack/pack-.pack.lock") + GIT_OID_SHA1_HEXSIZE;
 	size_t max, i;
 	git_str path = GIT_STR_INIT;
 	git_repository *one = NULL, *two = NULL;
diff --git a/tests/libgit2/reset/soft.c b/tests/libgit2/reset/soft.c
index aca0834f2..128905021 100644
--- a/tests/libgit2/reset/soft.c
+++ b/tests/libgit2/reset/soft.c
@@ -53,11 +53,11 @@ void test_reset_soft__can_reset_the_detached_Head_to_the_specified_commit(void)
 void test_reset_soft__resetting_to_the_commit_pointed_at_by_the_Head_does_not_change_the_target_of_the_Head(void)
 {
 	git_oid oid;
-	char raw_head_oid[GIT_OID_HEXSZ + 1];
+	char raw_head_oid[GIT_OID_SHA1_HEXSIZE + 1];
 
 	cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD"));
 	git_oid_fmt(raw_head_oid, &oid);
-	raw_head_oid[GIT_OID_HEXSZ] = '\0';
+	raw_head_oid[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	cl_git_pass(git_revparse_single(&target, repo, raw_head_oid));
 
diff --git a/tests/libgit2/revwalk/basic.c b/tests/libgit2/revwalk/basic.c
index 2c8d885e2..358f57716 100644
--- a/tests/libgit2/revwalk/basic.c
+++ b/tests/libgit2/revwalk/basic.c
@@ -50,12 +50,12 @@ static const int result_bytes = 24;
 static int get_commit_index(git_oid *raw_oid)
 {
 	int i;
-	char oid[GIT_OID_HEXSZ];
+	char oid[GIT_OID_SHA1_HEXSIZE];
 
 	git_oid_fmt(oid, raw_oid);
 
 	for (i = 0; i < commit_count; ++i)
-		if (memcmp(oid, commit_ids[i], GIT_OID_HEXSZ) == 0)
+		if (memcmp(oid, commit_ids[i], GIT_OID_SHA1_HEXSIZE) == 0)
 			return i;
 
 	return -1;
@@ -75,9 +75,9 @@ static int test_walk_only(git_revwalk *walk,
 	while (git_revwalk_next(&oid, walk) == 0) {
 		result_array[i++] = get_commit_index(&oid);
 		/*{
-			char str[GIT_OID_HEXSZ+1];
+			char str[GIT_OID_SHA1_HEXSIZE+1];
 			git_oid_fmt(str, &oid);
-			str[GIT_OID_HEXSZ] = 0;
+			str[GIT_OID_SHA1_HEXSIZE] = 0;
 			printf("  %d) %s\n", i, str);
 		}*/
 	}