diff --git a/pgtype/aclitemarray.go b/pgtype/aclitem_array.go
similarity index 100%
rename from pgtype/aclitemarray.go
rename to pgtype/aclitem_array.go
diff --git a/pgtype/aclitemarray_test.go b/pgtype/aclitem_array_test.go
similarity index 100%
rename from pgtype/aclitemarray_test.go
rename to pgtype/aclitem_array_test.go
diff --git a/pgtype/boolarray.go b/pgtype/bool_array.go
similarity index 100%
rename from pgtype/boolarray.go
rename to pgtype/bool_array.go
diff --git a/pgtype/boolarray_test.go b/pgtype/bool_array_test.go
similarity index 100%
rename from pgtype/boolarray_test.go
rename to pgtype/bool_array_test.go
diff --git a/pgtype/byteaarray.go b/pgtype/bytea_array.go
similarity index 100%
rename from pgtype/byteaarray.go
rename to pgtype/bytea_array.go
diff --git a/pgtype/byteaarray_test.go b/pgtype/bytea_array_test.go
similarity index 100%
rename from pgtype/byteaarray_test.go
rename to pgtype/bytea_array_test.go
diff --git a/pgtype/cidrarray.go b/pgtype/cidr_array.go
similarity index 100%
rename from pgtype/cidrarray.go
rename to pgtype/cidr_array.go
diff --git a/pgtype/datearray.go b/pgtype/date_array.go
similarity index 100%
rename from pgtype/datearray.go
rename to pgtype/date_array.go
diff --git a/pgtype/datearray_test.go b/pgtype/date_array_test.go
similarity index 100%
rename from pgtype/datearray_test.go
rename to pgtype/date_array_test.go
diff --git a/pgtype/float4array.go b/pgtype/float4_array.go
similarity index 100%
rename from pgtype/float4array.go
rename to pgtype/float4_array.go
diff --git a/pgtype/float4array_test.go b/pgtype/float4_array_test.go
similarity index 100%
rename from pgtype/float4array_test.go
rename to pgtype/float4_array_test.go
diff --git a/pgtype/float8array.go b/pgtype/float8_array.go
similarity index 100%
rename from pgtype/float8array.go
rename to pgtype/float8_array.go
diff --git a/pgtype/float8array_test.go b/pgtype/float8_array_test.go
similarity index 100%
rename from pgtype/float8array_test.go
rename to pgtype/float8_array_test.go
diff --git a/pgtype/inetarray.go b/pgtype/inet_array.go
similarity index 100%
rename from pgtype/inetarray.go
rename to pgtype/inet_array.go
diff --git a/pgtype/inetarray_test.go b/pgtype/inet_array_test.go
similarity index 100%
rename from pgtype/inetarray_test.go
rename to pgtype/inet_array_test.go
diff --git a/pgtype/int2array.go b/pgtype/int2_array.go
similarity index 100%
rename from pgtype/int2array.go
rename to pgtype/int2_array.go
diff --git a/pgtype/int2array_test.go b/pgtype/int2_array_test.go
similarity index 100%
rename from pgtype/int2array_test.go
rename to pgtype/int2_array_test.go
diff --git a/pgtype/int4array.go b/pgtype/int4_array.go
similarity index 100%
rename from pgtype/int4array.go
rename to pgtype/int4_array.go
diff --git a/pgtype/int4array_test.go b/pgtype/int4_array_test.go
similarity index 100%
rename from pgtype/int4array_test.go
rename to pgtype/int4_array_test.go
diff --git a/pgtype/int8array.go b/pgtype/int8_array.go
similarity index 100%
rename from pgtype/int8array.go
rename to pgtype/int8_array.go
diff --git a/pgtype/int8array_test.go b/pgtype/int8_array_test.go
similarity index 100%
rename from pgtype/int8array_test.go
rename to pgtype/int8_array_test.go
diff --git a/pgtype/textarray.go b/pgtype/text_array.go
similarity index 100%
rename from pgtype/textarray.go
rename to pgtype/text_array.go
diff --git a/pgtype/textarray_test.go b/pgtype/text_array_test.go
similarity index 100%
rename from pgtype/textarray_test.go
rename to pgtype/text_array_test.go
diff --git a/pgtype/timestamparray.go b/pgtype/timestamp_array.go
similarity index 100%
rename from pgtype/timestamparray.go
rename to pgtype/timestamp_array.go
diff --git a/pgtype/timestamparray_test.go b/pgtype/timestamp_array_test.go
similarity index 100%
rename from pgtype/timestamparray_test.go
rename to pgtype/timestamp_array_test.go
diff --git a/pgtype/timestamptzarray.go b/pgtype/timestamptz_array.go
similarity index 100%
rename from pgtype/timestamptzarray.go
rename to pgtype/timestamptz_array.go
diff --git a/pgtype/timestamptzarray_test.go b/pgtype/timestamptz_array_test.go
similarity index 100%
rename from pgtype/timestamptzarray_test.go
rename to pgtype/timestamptz_array_test.go
diff --git a/pgtype/typed_array_gen.sh b/pgtype/typed_array_gen.sh
index 876f8a3c..32c298cc 100644
--- a/pgtype/typed_array_gen.sh
+++ b/pgtype/typed_array_gen.sh
@@ -1,13 +1,13 @@
-erb pgtype_array_type=Int2Array pgtype_element_type=Int2 go_array_types=[]int16,[]uint16 element_oid=Int2OID text_null=NULL typed_array.go.erb > int2array.go
-erb pgtype_array_type=Int4Array pgtype_element_type=Int4 go_array_types=[]int32,[]uint32 element_oid=Int4OID text_null=NULL typed_array.go.erb > int4array.go
-erb pgtype_array_type=Int8Array pgtype_element_type=Int8 go_array_types=[]int64,[]uint64 element_oid=Int8OID text_null=NULL typed_array.go.erb > int8array.go
-erb pgtype_array_type=BoolArray pgtype_element_type=Bool go_array_types=[]bool element_oid=BoolOID text_null=NULL typed_array.go.erb > boolarray.go
-erb pgtype_array_type=DateArray pgtype_element_type=Date go_array_types=[]time.Time element_oid=DateOID text_null=NULL typed_array.go.erb > datearray.go
-erb pgtype_array_type=TimestamptzArray pgtype_element_type=Timestamptz go_array_types=[]time.Time element_oid=TimestamptzOID text_null=NULL typed_array.go.erb > timestamptzarray.go
-erb pgtype_array_type=TimestampArray pgtype_element_type=Timestamp go_array_types=[]time.Time element_oid=TimestampOID text_null=NULL typed_array.go.erb > timestamparray.go
-erb pgtype_array_type=Float4Array pgtype_element_type=Float4 go_array_types=[]float32 element_oid=Float4OID text_null=NULL typed_array.go.erb > float4array.go
-erb pgtype_array_type=Float8Array pgtype_element_type=Float8 go_array_types=[]float64 element_oid=Float8OID text_null=NULL typed_array.go.erb > float8array.go
-erb pgtype_array_type=InetArray pgtype_element_type=Inet go_array_types=[]*net.IPNet,[]net.IP element_oid=InetOID text_null=NULL typed_array.go.erb > inetarray.go
-erb pgtype_array_type=TextArray pgtype_element_type=Text go_array_types=[]string element_oid=TextOID text_null='"NULL"' typed_array.go.erb > textarray.go
-erb pgtype_array_type=ByteaArray pgtype_element_type=Bytea go_array_types=[][]byte element_oid=ByteaOID text_null=NULL typed_array.go.erb > byteaarray.go
-erb pgtype_array_type=ACLItemArray pgtype_element_type=ACLItem go_array_types=[]string element_oid=ACLItemOID text_null=NULL typed_array.go.erb > aclitemarray.go
+erb pgtype_array_type=Int2Array pgtype_element_type=Int2 go_array_types=[]int16,[]uint16 element_oid=Int2OID text_null=NULL typed_array.go.erb > int2_array.go
+erb pgtype_array_type=Int4Array pgtype_element_type=Int4 go_array_types=[]int32,[]uint32 element_oid=Int4OID text_null=NULL typed_array.go.erb > int4_array.go
+erb pgtype_array_type=Int8Array pgtype_element_type=Int8 go_array_types=[]int64,[]uint64 element_oid=Int8OID text_null=NULL typed_array.go.erb > int8_array.go
+erb pgtype_array_type=BoolArray pgtype_element_type=Bool go_array_types=[]bool element_oid=BoolOID text_null=NULL typed_array.go.erb > bool_array.go
+erb pgtype_array_type=DateArray pgtype_element_type=Date go_array_types=[]time.Time element_oid=DateOID text_null=NULL typed_array.go.erb > date_array.go
+erb pgtype_array_type=TimestamptzArray pgtype_element_type=Timestamptz go_array_types=[]time.Time element_oid=TimestamptzOID text_null=NULL typed_array.go.erb > timestamptz_array.go
+erb pgtype_array_type=TimestampArray pgtype_element_type=Timestamp go_array_types=[]time.Time element_oid=TimestampOID text_null=NULL typed_array.go.erb > timestamp_array.go
+erb pgtype_array_type=Float4Array pgtype_element_type=Float4 go_array_types=[]float32 element_oid=Float4OID text_null=NULL typed_array.go.erb > float4_array.go
+erb pgtype_array_type=Float8Array pgtype_element_type=Float8 go_array_types=[]float64 element_oid=Float8OID text_null=NULL typed_array.go.erb > float8_array.go
+erb pgtype_array_type=InetArray pgtype_element_type=Inet go_array_types=[]*net.IPNet,[]net.IP element_oid=InetOID text_null=NULL typed_array.go.erb > inet_array.go
+erb pgtype_array_type=TextArray pgtype_element_type=Text go_array_types=[]string element_oid=TextOID text_null='"NULL"' typed_array.go.erb > text_array.go
+erb pgtype_array_type=ByteaArray pgtype_element_type=Bytea go_array_types=[][]byte element_oid=ByteaOID text_null=NULL typed_array.go.erb > bytea_array.go
+erb pgtype_array_type=ACLItemArray pgtype_element_type=ACLItem go_array_types=[]string element_oid=ACLItemOID text_null=NULL typed_array.go.erb > aclitem_array.go
diff --git a/pgtype/varchararray.go b/pgtype/varchar_array.go
similarity index 100%
rename from pgtype/varchararray.go
rename to pgtype/varchar_array.go