diff --git a/include/git/commit.h b/include/git/commit.h
index 160148d67..8cb3e7d4c 100644
--- a/include/git/commit.h
+++ b/include/git/commit.h
@@ -58,7 +58,7 @@ struct git_commit {
  *         pool's git_odb, or if the commit is present but is
  *         too malformed to be parsed successfully.
  */
-GIT_EXTERN(git_commit*) git_commit_parse(git_revp *pool, const git_oid *id);
+GIT_EXTERN(git_commit*) git_commit_parse(git_revpool *pool, const git_oid *id);
 
 /**
  * Get the id of a commit.
diff --git a/include/git/common.h b/include/git/common.h
index ca65c747f..47ee6e207 100644
--- a/include/git/common.h
+++ b/include/git/common.h
@@ -85,7 +85,7 @@
 GIT_BEGIN_DECL
 
 /** A revision traversal pool. */
-typedef struct git_revp git_revp;
+typedef struct git_revpool git_revpool;
 
 /** @} */
 GIT_END_DECL
diff --git a/include/git/revwalk.h b/include/git/revwalk.h
index cd8748951..5c0b005b6 100644
--- a/include/git/revwalk.h
+++ b/include/git/revwalk.h
@@ -50,40 +50,40 @@ GIT_BEGIN_DECL
  * @param db the database objects are read from.
  * @return the new traversal handle; NULL if memory is exhausted.
  */
-GIT_EXTERN(git_revp*) git_revp_alloc(git_odb *db);
+GIT_EXTERN(git_revpool*) gitrp_alloc(git_odb *db);
 
 /**
  * Reset the traversal machinary for reuse.
  * @param pool traversal handle to reset.
  */
-GIT_EXTERN(void) git_revp_reset(git_revp *pool);
+GIT_EXTERN(void) gitrp_reset(git_revpool *pool);
 
 /**
  * Mark an object to start traversal from.
  * @param pool the pool being used for the traversal.
  * @param commit the commit the commit to start from.
  */
-GIT_EXTERN(void) git_revp_pushc(git_revp *pool, git_commit *commit);
+GIT_EXTERN(void) gitrp_push(git_revpool *pool, git_commit *commit);
 
 /**
  * Mark a commit (and its ancestors) uninteresting for the output.
  * @param pool the pool being used for the traversal.
  * @param commit the commit the commit to start from.
  */
-GIT_EXTERN(void) git_revp_hidec(git_revp *pool, git_commit *commit);
+GIT_EXTERN(void) gitrp_hide(git_revpool *pool, git_commit *commit);
 
 /**
  * Get the next commit from the revision traversal.
  * @param pool the pool to pop the commit from.
  * @return next commit; NULL if there is no more output.
  */
-GIT_EXTERN(git_commit*) git_revp_nextc(git_revp *pool);
+GIT_EXTERN(git_commit*) gitrp_next(git_revpool *pool);
 
 /**
  * Free a revwalk previously allocated.
  * @param pool traversal handle to close.  If NULL nothing occurs.
  */
-GIT_EXTERN(void) git_revp_free(git_revp *pool);
+GIT_EXTERN(void) gitrp_free(git_revpool *pool);
 
 /** @} */
 GIT_END_DECL
diff --git a/src/revwalk.c b/src/revwalk.c
index 2c9eb2301..91822c50e 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -26,13 +26,13 @@
 #include "git/revwalk.h"
 #include <stdlib.h>
 
-struct git_revp {
+struct git_revpool {
 	git_odb *db;
 };
 
-git_revp *git_revp_alloc(git_odb *db)
+git_revpool *git_revpool_alloc(git_odb *db)
 {
-	git_revp *walk = malloc(sizeof(*walk));
+	git_revpool *walk = malloc(sizeof(*walk));
 	if (!walk)
 		return NULL;
 
@@ -40,7 +40,7 @@ git_revp *git_revp_alloc(git_odb *db)
 	return walk;
 }
 
-void git_revp_free(git_revp *walk)
+void git_revpool_free(git_revpool *walk)
 {
 	free(walk);
 }