diff --git a/diff.go b/diff.go
index 9b3b278..7a41f86 100644
--- a/diff.go
+++ b/diff.go
@@ -144,7 +144,7 @@ func (diff *Diff) NumDeltas() (int, error) {
 	return ret, nil
 }
 
-func (diff *Diff) GetDelta(index int) (DiffDelta, error) {
+func (diff *Diff) Delta(index int) (DiffDelta, error) {
 	if diff.ptr == nil {
 		return DiffDelta{}, ErrInvalid
 	}
@@ -154,6 +154,11 @@ func (diff *Diff) GetDelta(index int) (DiffDelta, error) {
 	return ret, nil
 }
 
+// deprecated: You should use `Diff.Delta()` instead.
+func (diff *Diff) GetDelta(index int) (DiffDelta, error) {
+	return diff.Delta(index)
+}
+
 func newDiffFromC(ptr *C.git_diff, repo *Repository) *Diff {
 	if ptr == nil {
 		return nil
diff --git a/index.go b/index.go
index 32acd14..626e649 100644
--- a/index.go
+++ b/index.go
@@ -528,7 +528,7 @@ type IndexConflict struct {
 	Their    *IndexEntry
 }
 
-func (v *Index) GetConflict(path string) (IndexConflict, error) {
+func (v *Index) Conflict(path string) (IndexConflict, error) {
 
 	var cancestor *C.git_index_entry
 	var cour *C.git_index_entry
@@ -553,6 +553,11 @@ func (v *Index) GetConflict(path string) (IndexConflict, error) {
 	return ret, nil
 }
 
+// deprecated: You should use `Index.Conflict()` instead.
+func (v *Index) GetConflict(path string) (IndexConflict, error) {
+	return v.Conflict(path)
+}
+
 func (v *Index) RemoveConflict(path string) error {
 
 	cpath := C.CString(path)
diff --git a/merge_test.go b/merge_test.go
index 7cf034f..319bef3 100644
--- a/merge_test.go
+++ b/merge_test.go
@@ -109,7 +109,7 @@ func TestMergeTreesWithoutAncestor(t *testing.T) {
 	if !index.HasConflicts() {
 		t.Fatal("expected conflicts in the index")
 	}
-	_, err = index.GetConflict("README")
+	_, err = index.Conflict("README")
 	checkFatal(t, err)
 
 }
diff --git a/settings.go b/settings.go
index 72fffc5..2472908 100644
--- a/settings.go
+++ b/settings.go
@@ -93,10 +93,15 @@ func EnableCaching(enabled bool) error {
 	}
 }
 
-func GetCachedMemory() (current int, allowed int, err error) {
+func CachedMemory() (current int, allowed int, err error) {
 	return getSizetSizet(C.GIT_OPT_GET_CACHED_MEMORY)
 }
 
+// deprecated: You should use `CachedMemory()` instead.
+func GetCachedMemory() (current int, allowed int, err error) {
+	return CachedMemory()
+}
+
 func SetCacheMaxSize(maxSize int) error {
 	return setSizet(C.GIT_OPT_SET_CACHE_MAX_SIZE, maxSize)
 }
diff --git a/settings_test.go b/settings_test.go
index 4e45567..150ee7c 100644
--- a/settings_test.go
+++ b/settings_test.go
@@ -57,8 +57,8 @@ func TestEnableCaching(t *testing.T) {
 	checkFatal(t, err)
 }
 
-func TestGetCachedMemory(t *testing.T) {
-	current, allowed, err := GetCachedMemory()
+func TestCachedMemory(t *testing.T) {
+	current, allowed, err := CachedMemory()
 	checkFatal(t, err)
 
 	if current < 0 {