diff --git a/release.go b/release.go
index cd9945e..b4e0c6a 100644
--- a/release.go
+++ b/release.go
@@ -231,29 +231,29 @@ func header_release_common(w io.Writer) error {
 	info  os.FileInfo
 }
 
-type bindata_file_info struct {
+type bindataFileInfo struct {
 	name string
 	size int64
 	mode os.FileMode
 	modTime time.Time
 }
 
-func (fi bindata_file_info) Name() string {
+func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
-func (fi bindata_file_info) Size() int64 {
+func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
-func (fi bindata_file_info) Mode() os.FileMode {
+func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
-func (fi bindata_file_info) ModTime() time.Time {
+func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
-func (fi bindata_file_info) IsDir() bool {
+func (fi bindataFileInfo) IsDir() bool {
 	return false
 }
-func (fi bindata_file_info) Sys() interface{} {
+func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
@@ -386,7 +386,7 @@ func asset_release_common(w io.Writer, c *Config, asset *Asset) error {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: %q, size: %d, mode: os.FileMode(%d), modTime: time.Unix(%d, 0)}
+	info := bindataFileInfo{name: %q, size: %d, mode: os.FileMode(%d), modTime: time.Unix(%d, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
diff --git a/testdata/out/compress-memcopy.go b/testdata/out/compress-memcopy.go
index 2216e5c..4ac8498 100644
--- a/testdata/out/compress-memcopy.go
+++ b/testdata/out/compress-memcopy.go
@@ -38,29 +38,29 @@ type asset struct {
 	info  os.FileInfo
 }
 
-type bindata_file_info struct {
+type bindataFileInfo struct {
 	name string
 	size int64
 	mode os.FileMode
 	modTime time.Time
 }
 
-func (fi bindata_file_info) Name() string {
+func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
-func (fi bindata_file_info) Size() int64 {
+func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
-func (fi bindata_file_info) Mode() os.FileMode {
+func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
-func (fi bindata_file_info) ModTime() time.Time {
+func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
-func (fi bindata_file_info) IsDir() bool {
+func (fi bindataFileInfo) IsDir() bool {
 	return false
 }
-func (fi bindata_file_info) Sys() interface{} {
+func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
@@ -79,7 +79,7 @@ func in_a_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -99,7 +99,7 @@ func in_b_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -119,7 +119,7 @@ func in_c_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -139,7 +139,7 @@ func in_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
diff --git a/testdata/out/compress-nomemcopy.go b/testdata/out/compress-nomemcopy.go
index 991faff..e950e3b 100644
--- a/testdata/out/compress-nomemcopy.go
+++ b/testdata/out/compress-nomemcopy.go
@@ -48,29 +48,29 @@ type asset struct {
 	info  os.FileInfo
 }
 
-type bindata_file_info struct {
+type bindataFileInfo struct {
 	name string
 	size int64
 	mode os.FileMode
 	modTime time.Time
 }
 
-func (fi bindata_file_info) Name() string {
+func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
-func (fi bindata_file_info) Size() int64 {
+func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
-func (fi bindata_file_info) Mode() os.FileMode {
+func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
-func (fi bindata_file_info) ModTime() time.Time {
+func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
-func (fi bindata_file_info) IsDir() bool {
+func (fi bindataFileInfo) IsDir() bool {
 	return false
 }
-func (fi bindata_file_info) Sys() interface{} {
+func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
@@ -89,7 +89,7 @@ func in_a_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -109,7 +109,7 @@ func in_b_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -129,7 +129,7 @@ func in_c_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -149,7 +149,7 @@ func in_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
diff --git a/testdata/out/nocompress-memcopy.go b/testdata/out/nocompress-memcopy.go
index 034c30f..c8e8731 100644
--- a/testdata/out/nocompress-memcopy.go
+++ b/testdata/out/nocompress-memcopy.go
@@ -14,29 +14,29 @@ type asset struct {
 	info  os.FileInfo
 }
 
-type bindata_file_info struct {
+type bindataFileInfo struct {
 	name string
 	size int64
 	mode os.FileMode
 	modTime time.Time
 }
 
-func (fi bindata_file_info) Name() string {
+func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
-func (fi bindata_file_info) Size() int64 {
+func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
-func (fi bindata_file_info) Mode() os.FileMode {
+func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
-func (fi bindata_file_info) ModTime() time.Time {
+func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
-func (fi bindata_file_info) IsDir() bool {
+func (fi bindataFileInfo) IsDir() bool {
 	return false
 }
-func (fi bindata_file_info) Sys() interface{} {
+func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
@@ -53,7 +53,7 @@ func in_a_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -71,7 +71,7 @@ func in_b_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -89,7 +89,7 @@ func in_c_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -107,7 +107,7 @@ func in_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
diff --git a/testdata/out/nocompress-nomemcopy.go b/testdata/out/nocompress-nomemcopy.go
index 2c0c9b8..d23326d 100644
--- a/testdata/out/nocompress-nomemcopy.go
+++ b/testdata/out/nocompress-nomemcopy.go
@@ -28,29 +28,29 @@ type asset struct {
 	info  os.FileInfo
 }
 
-type bindata_file_info struct {
+type bindataFileInfo struct {
 	name string
 	size int64
 	mode os.FileMode
 	modTime time.Time
 }
 
-func (fi bindata_file_info) Name() string {
+func (fi bindataFileInfo) Name() string {
 	return fi.name
 }
-func (fi bindata_file_info) Size() int64 {
+func (fi bindataFileInfo) Size() int64 {
 	return fi.size
 }
-func (fi bindata_file_info) Mode() os.FileMode {
+func (fi bindataFileInfo) Mode() os.FileMode {
 	return fi.mode
 }
-func (fi bindata_file_info) ModTime() time.Time {
+func (fi bindataFileInfo) ModTime() time.Time {
 	return fi.modTime
 }
-func (fi bindata_file_info) IsDir() bool {
+func (fi bindataFileInfo) IsDir() bool {
 	return false
 }
-func (fi bindata_file_info) Sys() interface{} {
+func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
@@ -69,7 +69,7 @@ func in_a_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -89,7 +89,7 @@ func in_b_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -109,7 +109,7 @@ func in_c_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -129,7 +129,7 @@ func in_test_asset() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }