diff --git a/include/git2/types.h b/include/git2/types.h
index a99195fc4..aa53909d2 100644
--- a/include/git2/types.h
+++ b/include/git2/types.h
@@ -126,7 +126,7 @@ typedef struct git_index git_index;
 typedef struct git_config git_config;
 
 /** Memory representation of a config variable */
-typedef struct git_config_var git_config_var;
+typedef struct git_cvar git_cvar;
 
 /** Time in a signature */
 typedef struct git_time {
diff --git a/src/config.h b/src/config.h
index 07d123ef5..2aa9ec804 100644
--- a/src/config.h
+++ b/src/config.h
@@ -18,10 +18,10 @@ typedef enum {
 	GIT_VAR_INT,
 	GIT_VAR_BOOL,
 	GIT_VAR_STR
-} git_config_type;
+} git_cvar_type;
 
-struct git_config_var {
-	git_config_type type;
+struct git_cvar {
+	git_cvar_type type;
 	char *name;
 	union {
 		unsigned char boolean;