diff --git a/git.go b/git.go
index d672d77..cdcf6bb 100644
--- a/git.go
+++ b/git.go
@@ -200,9 +200,9 @@ func NewOid(s string) (*Oid, error) {
 
 	o := new(Oid)
 
-	slice, err := hex.DecodeString(s)
-	if err != nil {
-		return nil, err
+	slice, error := hex.DecodeString(s)
+	if error != nil {
+		return nil, error
 	}
 
 	if len(slice) != 20 {
diff --git a/index.go b/index.go
index f1f2e9d..99dbd7a 100644
--- a/index.go
+++ b/index.go
@@ -57,8 +57,8 @@ type Index struct {
 }
 
 type IndexTime struct {
-	seconds     int32
-	nanoseconds uint32
+	Seconds     int32
+	Nanoseconds uint32
 }
 
 type IndexEntry struct {
@@ -89,10 +89,10 @@ func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
 }
 
 func populateCIndexEntry(source *IndexEntry, dest *C.git_index_entry) {
-	dest.ctime.seconds = C.int32_t(source.Ctime.seconds)
-	dest.ctime.nanoseconds = C.uint32_t(source.Ctime.nanoseconds)
-	dest.mtime.seconds = C.int32_t(source.Mtime.seconds)
-	dest.mtime.nanoseconds = C.uint32_t(source.Mtime.nanoseconds)
+	dest.ctime.seconds = C.int32_t(source.Ctime.Seconds)
+	dest.ctime.nanoseconds = C.uint32_t(source.Ctime.Nanoseconds)
+	dest.mtime.seconds = C.int32_t(source.Mtime.Seconds)
+	dest.mtime.nanoseconds = C.uint32_t(source.Mtime.Nanoseconds)
 	dest.mode = C.uint32_t(source.Mode)
 	dest.uid = C.uint32_t(source.Uid)
 	dest.gid = C.uint32_t(source.Gid)
diff --git a/odb_test.go b/odb_test.go
index ed5c24c..cb3ab55 100644
--- a/odb_test.go
+++ b/odb_test.go
@@ -61,31 +61,31 @@ func TestOdbStream(t *testing.T) {
 
 	_, _ = seedTestRepo(t, repo)
 
-	odb, err := repo.Odb()
-	checkFatal(t, err)
+	odb, error := repo.Odb()
+	checkFatal(t, error)
 
 	str := "hello, world!"
 
-	writeStream, err := odb.NewWriteStream(int64(len(str)), ObjectBlob)
-	checkFatal(t, err)
-	n, err := io.WriteString(writeStream, str)
-	checkFatal(t, err)
+	writeStream, error := odb.NewWriteStream(int64(len(str)), ObjectBlob)
+	checkFatal(t, error)
+	n, error := io.WriteString(writeStream, str)
+	checkFatal(t, error)
 	if n != len(str) {
 		t.Fatalf("Bad write length %v != %v", n, len(str))
 	}
 
-	err = writeStream.Close()
-	checkFatal(t, err)
+	error = writeStream.Close()
+	checkFatal(t, error)
 
-	expectedId, err := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
-	checkFatal(t, err)
+	expectedId, error := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
+	checkFatal(t, error)
 	if writeStream.Id.Cmp(expectedId) != 0 {
 		t.Fatal("Wrong data written")
 	}
 
-	readStream, err := odb.NewReadStream(&writeStream.Id)
-	checkFatal(t, err)
-	data, err := ioutil.ReadAll(readStream)
+	readStream, error := odb.NewReadStream(&writeStream.Id)
+	checkFatal(t, error)
+	data, error := ioutil.ReadAll(readStream)
 	if str != string(data) {
 		t.Fatalf("Wrong data read %v != %v", str, string(data))
 	}
@@ -98,8 +98,8 @@ func TestOdbHash(t *testing.T) {
 
 	_, _ = seedTestRepo(t, repo)
 
-	odb, err := repo.Odb()
-	checkFatal(t, err)
+	odb, error := repo.Odb()
+	checkFatal(t, error)
 
 	str := `tree 115fcae49287c82eb55bb275cbbd4556fbed72b7
 parent 66e1c476199ebcd3e304659992233132c5a52c6c
@@ -109,11 +109,11 @@ committer John Doe <john@doe.com> 1390682018 +0000
 Initial commit.`
 
 	for _, data := range [][]byte{[]byte(str), doublePointerBytes()} {
-		oid, err := odb.Hash(data, ObjectCommit)
-		checkFatal(t, err)
+		oid, error := odb.Hash(data, ObjectCommit)
+		checkFatal(t, error)
 
-		coid, err := odb.Write(data, ObjectCommit)
-		checkFatal(t, err)
+		coid, error := odb.Write(data, ObjectCommit)
+		checkFatal(t, error)
 
 		if oid.Cmp(coid) != 0 {
 			t.Fatal("Hash and write Oids are different")