diff --git a/ObjectiveGit/GTCredential.m b/ObjectiveGit/GTCredential.m
index d996f17b..d7f1a0ad 100644
--- a/ObjectiveGit/GTCredential.m
+++ b/ObjectiveGit/GTCredential.m
@@ -40,7 +40,7 @@ - (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL u
 @end
 
 @interface GTCredential ()
-@property (nonatomic, assign, readonly) git_credential *git_cred;
+@property (nonatomic, assign, readonly) git_credential *git_credential;
 @end
 
 @implementation GTCredential
@@ -91,7 +91,7 @@ - (instancetype)initWithGitCred:(git_credential *)cred {
 
 	if (self == nil) return nil;
 
-	_git_cred = cred;
+	_git_credential = cred;
 
 	return self;
 }
@@ -119,6 +119,6 @@ int GTCredentialAcquireCallback(git_credential **cred, const char *url, const ch
 		return GIT_ERROR;
 	}
 
-	*cred = gtCred.git_cred;
+	*cred = gtCred.git_credential;
 	return GIT_OK;
 }
diff --git a/ObjectiveGit/GTRepository+Merging.m b/ObjectiveGit/GTRepository+Merging.m
index 3832024f..5bfd3aba 100644
--- a/ObjectiveGit/GTRepository+Merging.m
+++ b/ObjectiveGit/GTRepository+Merging.m
@@ -199,7 +199,7 @@ - (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourS
 
 	// initialize our merge file input
 	git_merge_file_input ourInput;
-	gitError = git_merge_file_options_init(&ourInput, GIT_MERGE_FILE_INPUT_VERSION);
+	gitError = git_merge_file_input_init(&ourInput, GIT_MERGE_FILE_INPUT_VERSION);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create merge file input for our side"];
 		return nil;