thodg/libgit2

diff --git a/include/git2/oid.h b/include/git2/oid.h
index d87d8f6..3097a2d 100644
--- a/include/git2/oid.h
+++ b/include/git2/oid.h
@@ -97,7 +97,7 @@ GIT_EXTERN(void) git_oid_fmt(char *str, const git_oid *oid);
 GIT_EXTERN(void) git_oid_pathfmt(char *str, const git_oid *oid);
 
 /**
- * Format a gid_oid into a newly allocated c-string.
+ * Format a git_oid into a newly allocated c-string.
  * @param oid the oid structure to format
  * @return the c-string; NULL if memory is exhausted.  Caller must
  *         deallocate the string with free().
@@ -144,7 +144,7 @@ GIT_EXTERN(int) git_oid_cmp(const git_oid *a, const git_oid *b);
  * @param b second oid structure.
  * @return 0 in case of a match
  */
-GIT_EXTERN(int) gid_oid_ncmp(unsigned int len, git_oid *a, git_oid *b);
+GIT_EXTERN(int) git_oid_ncmp(unsigned int len, git_oid *a, git_oid *b);
 
 /**
  * OID Shortener object
diff --git a/src/oid.c b/src/oid.c
index aab93cb..6bf4211 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -193,7 +193,7 @@ int git_oid_ncmp_hex(unsigned int len, const unsigned char *a, const unsigned ch
 	return memcmp(a, b, len);
 }
 
-int gid_oid_ncmp(unsigned int len, git_oid *a, git_oid *b)
+int git_oid_ncmp(unsigned int len, git_oid *a, git_oid *b)
 {
 	return git_oid_ncmp_raw(len, a->id, b->id);
 }