bencode/both_test.go | 20 ++++++++++----------

diff --git a/bencode/both_test.go b/bencode/both_test.go
index 7ee1454ed7a0b3ac990be49009680863d9c47072..d837b6193230271ca5f885919b29ad52cfd9320a 100644
--- a/bencode/both_test.go
+++ b/bencode/both_test.go
@@ -4,7 +4,7 @@ import "testing"
 import "bytes"
 import "io/ioutil"
 
-func load_file(name string, t *testing.T) []byte {
+func loadFile(name string, t *testing.T) []byte {
 	data, err := ioutil.ReadFile(name)
 	if err != nil {
 		t.Fatal(err)
@@ -12,8 +12,8 @@ 	}
 	return data
 }
 
-func test_file_interface(t *testing.T, filename string) {
-	data1 := load_file(filename, t)
+func testFileInterface(t *testing.T, filename string) {
+	data1 := loadFile(filename, t)
 	var iface interface{}
 
 	err := Unmarshal(data1, &iface)
@@ -33,11 +33,11 @@
 }
 
 func TestBothInterface(t *testing.T) {
-	test_file_interface(t, "testdata/archlinux-2011.08.19-netinstall-i686.iso.torrent")
-	test_file_interface(t, "testdata/continuum.torrent")
+	testFileInterface(t, "testdata/archlinux-2011.08.19-netinstall-i686.iso.torrent")
+	testFileInterface(t, "testdata/continuum.torrent")
 }
 
-type torrent_file struct {
+type torrentFile struct {
 	Info struct {
 		Name        string `bencode:"name"`
 		Length      int64  `bencode:"length"`
@@ -55,9 +55,9 @@ 	CreatedBy    string      `bencode:"created by,omitempty"`
 	URLList      interface{} `bencode:"url-list,omitempty"`
 }
 
-func test_file(t *testing.T, filename string) {
-	data1 := load_file(filename, t)
-	var f torrent_file
+func testFile(t *testing.T, filename string) {
+	data1 := loadFile(filename, t)
+	var f torrentFile
 
 	err := Unmarshal(data1, &f)
 	if err != nil {
@@ -76,5 +76,5 @@ 	}
 }
 
 func TestBoth(t *testing.T) {
-	test_file(t, "testdata/archlinux-2011.08.19-netinstall-i686.iso.torrent")
+	testFile(t, "testdata/archlinux-2011.08.19-netinstall-i686.iso.torrent")
 }