diff --git a/batch.go b/batch.go
index b08b271c..784cf97c 100644
--- a/batch.go
+++ b/batch.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 	"github.com/pkg/errors"
 )
 
diff --git a/batch_test.go b/batch_test.go
index 8709f17d..a425455b 100644
--- a/batch_test.go
+++ b/batch_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 func TestConnBeginBatch(t *testing.T) {
diff --git a/bench_test.go b/bench_test.go
index f0d65419..0d89bf72 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 func BenchmarkPointerPointerWithNullValues(b *testing.B) {
diff --git a/conn.go b/conn.go
index a633b349..db56510d 100644
--- a/conn.go
+++ b/conn.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgproto3/v2"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 const (
diff --git a/conn_test.go b/conn_test.go
index 28f78744..bdb3de8d 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
 	"github.com/stretchr/testify/require"
 	errors "golang.org/x/xerrors"
 )
diff --git a/copy_from_test.go b/copy_from_test.go
index b74878a8..5313b48c 100644
--- a/copy_from_test.go
+++ b/copy_from_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/pkg/errors"
 )
 
diff --git a/example_custom_type_test.go b/example_custom_type_test.go
index 594fc9e4..ac286d24 100644
--- a/example_custom_type_test.go
+++ b/example_custom_type_test.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
 	"github.com/pkg/errors"
 )
 
diff --git a/example_json_test.go b/example_json_test.go
index 4863cb5a..33bd7519 100644
--- a/example_json_test.go
+++ b/example_json_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 func Example_JSON() {
diff --git a/examples/chat/main.go b/examples/chat/main.go
index e269b78f..3d177e83 100644
--- a/examples/chat/main.go
+++ b/examples/chat/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	pgxpool "github.com/jackc/pgx/pool"
+	pgxpool "github.com/jackc/pgx/v4/pool"
 )
 
 var pool *pgxpool.Pool
diff --git a/examples/todo/main.go b/examples/todo/main.go
index cbe93307..9aa8c1cb 100644
--- a/examples/todo/main.go
+++ b/examples/todo/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 var conn *pgx.Conn
diff --git a/examples/url_shortener/main.go b/examples/url_shortener/main.go
index 7e4ba134..af78c4f5 100644
--- a/examples/url_shortener/main.go
+++ b/examples/url_shortener/main.go
@@ -10,8 +10,8 @@ func main() {
 // 	"net/http"
 // 	"os"
 
-// 	"github.com/jackc/pgx"
-// 	"github.com/jackc/pgx/log/log15adapter"
+// 	"github.com/jackc/pgx/v4"
+// 	"github.com/jackc/pgx/v4/log/log15adapter"
 // 	log "gopkg.in/inconshreveable/log15.v2"
 // )
 
diff --git a/fastpath.go b/fastpath.go
index e3ce3969..72d597d0 100644
--- a/fastpath.go
+++ b/fastpath.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/jackc/pgio"
 	"github.com/jackc/pgproto3"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 func newFastpath(cn *Conn) *fastpath {
diff --git a/go.mod b/go.mod
index 9d0f0632..25a7dcaa 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/jackc/pgx
+module github.com/jackc/pgx/v4
 
 go 1.12
 
diff --git a/go.sum b/go.sum
index d87851c7..cca95bdf 100644
--- a/go.sum
+++ b/go.sum
@@ -6,28 +6,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
-github.com/jackc/pgconn v0.0.0-20190405170659-7ad3625edd3b h1:EFVP6CIXsShWT+mEeoVGMvJz1a1SAKqw8zQ15bz7cw8=
-github.com/jackc/pgconn v0.0.0-20190405170659-7ad3625edd3b/go.mod h1:8Bzf8vzi/ZpcgLgrq8IUHjZX4ZU+Hf6N6/AJ85+fDeE=
-github.com/jackc/pgconn v0.0.0-20190419194309-16412e56e22d h1:hcjvON7F1UqRaTfXygfWQRm4I+Z+v2ljeQ7tWNc6FdI=
-github.com/jackc/pgconn v0.0.0-20190419194309-16412e56e22d/go.mod h1:UsnoyBN75lNxOeZXUT70J9xAvZffv2fxrxCrIPIH/Rk=
-github.com/jackc/pgconn v0.0.0-20190419205212-7bb6c2f3e982 h1:U0G6KWiQ9xrqbXt96OV+BF5dKZdLbvedURzqGPqH5jg=
-github.com/jackc/pgconn v0.0.0-20190419205212-7bb6c2f3e982/go.mod h1:UsnoyBN75lNxOeZXUT70J9xAvZffv2fxrxCrIPIH/Rk=
-github.com/jackc/pgconn v0.0.0-20190419211655-3710e52a9a12 h1:PzGjcOqGl6npHTDt8yDK5lnI9/ZQ+5ZpywzazR+yd8Q=
-github.com/jackc/pgconn v0.0.0-20190419211655-3710e52a9a12/go.mod h1:UsnoyBN75lNxOeZXUT70J9xAvZffv2fxrxCrIPIH/Rk=
-github.com/jackc/pgconn v0.0.0-20190420161109-39e6ff5766bd h1:eSKDWtHcm6H/vELPrs6fh7bch3wBc2vUvqVnHw17+5c=
-github.com/jackc/pgconn v0.0.0-20190420161109-39e6ff5766bd/go.mod h1:UsnoyBN75lNxOeZXUT70J9xAvZffv2fxrxCrIPIH/Rk=
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3 h1:ZFYpB74Kq8xE9gmfxCmXD6QxZ27ja+j3HwGFc+YurhQ=
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.0.0 h1:25tUmlES7eyD96oYaUHc1dLOFbgcJtFzCdnOOoqmA1I=
-github.com/jackc/pgproto3 v1.0.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190419041544-9b6a681f50bf h1:wI8d/uq9/RfZOe6bKOpC4Skd4VgkTIGZqxmHu6IQGb8=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190419041544-9b6a681f50bf/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db h1:UpaKn/gYxzH6/zWyRQH1S260zvKqwJJ4h8+Kf09ooh0=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b h1:cIcUpcEP55F/QuZWEtXyqHoWk+IV4TBiLjtBkeq/Q1c=
@@ -68,8 +54,6 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcN
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
diff --git a/helper_test.go b/helper_test.go
index 74d04166..87e60792 100644
--- a/helper_test.go
+++ b/helper_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/large_objects.go b/large_objects.go
index 1083f397..4f60f6be 100644
--- a/large_objects.go
+++ b/large_objects.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 // LargeObjects is a structure used to access the large objects API. It is only
diff --git a/large_objects_test.go b/large_objects_test.go
index 052ae15d..856ac397 100644
--- a/large_objects_test.go
+++ b/large_objects_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 func TestLargeObjects(t *testing.T) {
diff --git a/log/log15adapter/adapter.go b/log/log15adapter/adapter.go
index 8623a380..6f120f88 100644
--- a/log/log15adapter/adapter.go
+++ b/log/log15adapter/adapter.go
@@ -3,7 +3,7 @@
 package log15adapter
 
 import (
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 // Log15Logger interface defines the subset of
diff --git a/log/logrusadapter/adapter.go b/log/logrusadapter/adapter.go
index 0ee0da0b..3c3d6f0e 100644
--- a/log/logrusadapter/adapter.go
+++ b/log/logrusadapter/adapter.go
@@ -3,7 +3,7 @@
 package logrusadapter
 
 import (
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/log/testingadapter/adapter.go b/log/testingadapter/adapter.go
index 6c9cde83..28e89bd1 100644
--- a/log/testingadapter/adapter.go
+++ b/log/testingadapter/adapter.go
@@ -5,7 +5,7 @@ package testingadapter
 import (
 	"fmt"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 // TestingLogger interface defines the subset of testing.TB methods used by this
diff --git a/log/zapadapter/adapter.go b/log/zapadapter/adapter.go
index 82263b6e..5011ee48 100644
--- a/log/zapadapter/adapter.go
+++ b/log/zapadapter/adapter.go
@@ -2,7 +2,7 @@
 package zapadapter
 
 import (
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
diff --git a/log/zerologadapter/adapter.go b/log/zerologadapter/adapter.go
index b3f01c0b..f3f07585 100644
--- a/log/zerologadapter/adapter.go
+++ b/log/zerologadapter/adapter.go
@@ -2,7 +2,7 @@
 package zerologadapter
 
 import (
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/rs/zerolog"
 )
 
diff --git a/messages.go b/messages.go
index dee1eec9..5b8d3da5 100644
--- a/messages.go
+++ b/messages.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgio"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 const (
diff --git a/pgmock/pgmock.go b/pgmock/pgmock.go
index 2dde8609..b1c505a4 100644
--- a/pgmock/pgmock.go
+++ b/pgmock/pgmock.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/jackc/pgproto3"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 type Server struct {
@@ -224,7 +224,7 @@ where (
 		SendMessage(&pgproto3.ParameterDescription{}),
 		SendMessage(&pgproto3.RowDescription{
 			Fields: []pgproto3.FieldDescription{
-				{Name: "oid",
+				{Name: []byte("oid"),
 					TableOID:             1247,
 					TableAttributeNumber: 65534,
 					DataTypeOID:          26,
@@ -232,7 +232,7 @@ where (
 					TypeModifier:         -1,
 					Format:               0,
 				},
-				{Name: "typname",
+				{Name: []byte("typname"),
 					TableOID:             1247,
 					TableAttributeNumber: 1,
 					DataTypeOID:          19,
@@ -435,7 +435,7 @@ where (
 		steps = append(steps, step)
 	}
 
-	steps = append(steps, SendMessage(&pgproto3.CommandComplete{CommandTag: "SELECT 163"}))
+	steps = append(steps, SendMessage(&pgproto3.CommandComplete{CommandTag: []byte("SELECT 163")}))
 	steps = append(steps, SendMessage(&pgproto3.ReadyForQuery{TxStatus: 'I'}))
 
 	steps = append(steps, []Step{
@@ -450,7 +450,7 @@ where (
 		SendMessage(&pgproto3.ParameterDescription{}),
 		SendMessage(&pgproto3.RowDescription{
 			Fields: []pgproto3.FieldDescription{
-				{Name: "oid",
+				{Name: []byte("oid"),
 					TableOID:             1247,
 					TableAttributeNumber: 65534,
 					DataTypeOID:          26,
@@ -458,7 +458,7 @@ where (
 					TypeModifier:         -1,
 					Format:               0,
 				},
-				{Name: "typname",
+				{Name: []byte("typname"),
 					TableOID:             1247,
 					TableAttributeNumber: 1,
 					DataTypeOID:          19,
@@ -475,7 +475,7 @@ where (
 		ExpectMessage(&pgproto3.Execute{}),
 		ExpectMessage(&pgproto3.Sync{}),
 		SendMessage(&pgproto3.BindComplete{}),
-		SendMessage(&pgproto3.CommandComplete{CommandTag: "SELECT 0"}),
+		SendMessage(&pgproto3.CommandComplete{CommandTag: []byte("SELECT 0")}),
 		SendMessage(&pgproto3.ReadyForQuery{TxStatus: 'I'}),
 	}...)
 
@@ -491,7 +491,7 @@ where (
 		SendMessage(&pgproto3.ParameterDescription{}),
 		SendMessage(&pgproto3.RowDescription{
 			Fields: []pgproto3.FieldDescription{
-				{Name: "oid",
+				{Name: []byte("oid"),
 					TableOID:             1247,
 					TableAttributeNumber: 65534,
 					DataTypeOID:          26,
@@ -499,7 +499,7 @@ where (
 					TypeModifier:         -1,
 					Format:               0,
 				},
-				{Name: "typname",
+				{Name: []byte("typname"),
 					TableOID:             1247,
 					TableAttributeNumber: 1,
 					DataTypeOID:          19,
@@ -507,7 +507,7 @@ where (
 					TypeModifier:         -1,
 					Format:               0,
 				},
-				{Name: "typbasetype",
+				{Name: []byte("typbasetype"),
 					TableOID:             1247,
 					TableAttributeNumber: 65534,
 					DataTypeOID:          26,
@@ -524,7 +524,7 @@ where (
 		ExpectMessage(&pgproto3.Execute{}),
 		ExpectMessage(&pgproto3.Sync{}),
 		SendMessage(&pgproto3.BindComplete{}),
-		SendMessage(&pgproto3.CommandComplete{CommandTag: "SELECT 0"}),
+		SendMessage(&pgproto3.CommandComplete{CommandTag: []byte("SELECT 0")}),
 		SendMessage(&pgproto3.ReadyForQuery{TxStatus: 'I'}),
 	}...)
 
diff --git a/pgtype/aclitem_array_test.go b/pgtype/aclitem_array_test.go
index 4e60afca..5f16ab28 100644
--- a/pgtype/aclitem_array_test.go
+++ b/pgtype/aclitem_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestACLItemArrayTranscode(t *testing.T) {
diff --git a/pgtype/aclitem_test.go b/pgtype/aclitem_test.go
index 65399a30..92dfc7a5 100644
--- a/pgtype/aclitem_test.go
+++ b/pgtype/aclitem_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestACLItemTranscode(t *testing.T) {
diff --git a/pgtype/array_test.go b/pgtype/array_test.go
index d1cdb4c5..d17d753c 100644
--- a/pgtype/array_test.go
+++ b/pgtype/array_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 func TestParseUntypedTextArray(t *testing.T) {
diff --git a/pgtype/bit_test.go b/pgtype/bit_test.go
index 19492bc9..05729323 100644
--- a/pgtype/bit_test.go
+++ b/pgtype/bit_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestBitTranscode(t *testing.T) {
diff --git a/pgtype/bool_array_test.go b/pgtype/bool_array_test.go
index b529555e..6d2d7c06 100644
--- a/pgtype/bool_array_test.go
+++ b/pgtype/bool_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestBoolArrayTranscode(t *testing.T) {
diff --git a/pgtype/bool_test.go b/pgtype/bool_test.go
index 04d9337d..5228e280 100644
--- a/pgtype/bool_test.go
+++ b/pgtype/bool_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestBoolTranscode(t *testing.T) {
diff --git a/pgtype/box_test.go b/pgtype/box_test.go
index 197401f3..aad10262 100644
--- a/pgtype/box_test.go
+++ b/pgtype/box_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestBoxTranscode(t *testing.T) {
diff --git a/pgtype/bpchar_array_test.go b/pgtype/bpchar_array_test.go
index e4f2e7eb..820dfa5b 100644
--- a/pgtype/bpchar_array_test.go
+++ b/pgtype/bpchar_array_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestBPCharArrayTranscode(t *testing.T) {
diff --git a/pgtype/bpchar_test.go b/pgtype/bpchar_test.go
index c076ca1b..e8981e52 100644
--- a/pgtype/bpchar_test.go
+++ b/pgtype/bpchar_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestChar3Transcode(t *testing.T) {
diff --git a/pgtype/bytea_array_test.go b/pgtype/bytea_array_test.go
index 8450b71b..00dc0a1f 100644
--- a/pgtype/bytea_array_test.go
+++ b/pgtype/bytea_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestByteaArrayTranscode(t *testing.T) {
diff --git a/pgtype/bytea_test.go b/pgtype/bytea_test.go
index fd5a0dec..75b55de4 100644
--- a/pgtype/bytea_test.go
+++ b/pgtype/bytea_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestByteaTranscode(t *testing.T) {
diff --git a/pgtype/cid_test.go b/pgtype/cid_test.go
index 924e4cf3..588e6c66 100644
--- a/pgtype/cid_test.go
+++ b/pgtype/cid_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestCIDTranscode(t *testing.T) {
diff --git a/pgtype/cidr_array_test.go b/pgtype/cidr_array_test.go
index 206a590f..71125bdb 100644
--- a/pgtype/cidr_array_test.go
+++ b/pgtype/cidr_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestCIDRArrayTranscode(t *testing.T) {
diff --git a/pgtype/circle_test.go b/pgtype/circle_test.go
index 634c5832..82598620 100644
--- a/pgtype/circle_test.go
+++ b/pgtype/circle_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestCircleTranscode(t *testing.T) {
diff --git a/pgtype/date_array_test.go b/pgtype/date_array_test.go
index 2ba19d1a..24a8282c 100644
--- a/pgtype/date_array_test.go
+++ b/pgtype/date_array_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestDateArrayTranscode(t *testing.T) {
diff --git a/pgtype/date_test.go b/pgtype/date_test.go
index d98e1652..ac7aadfe 100644
--- a/pgtype/date_test.go
+++ b/pgtype/date_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestDateTranscode(t *testing.T) {
diff --git a/pgtype/daterange_test.go b/pgtype/daterange_test.go
index d2af5986..4d3119ee 100644
--- a/pgtype/daterange_test.go
+++ b/pgtype/daterange_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestDaterangeTranscode(t *testing.T) {
diff --git a/pgtype/enum_array_test.go b/pgtype/enum_array_test.go
index 052a813c..dbe09751 100644
--- a/pgtype/enum_array_test.go
+++ b/pgtype/enum_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestEnumArrayTranscode(t *testing.T) {
diff --git a/pgtype/ext/satori-uuid/uuid.go b/pgtype/ext/satori-uuid/uuid.go
index baebc5ed..8713b4d6 100644
--- a/pgtype/ext/satori-uuid/uuid.go
+++ b/pgtype/ext/satori-uuid/uuid.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/pgtype/ext/satori-uuid/uuid_test.go b/pgtype/ext/satori-uuid/uuid_test.go
index 02ebb770..7a770b84 100644
--- a/pgtype/ext/satori-uuid/uuid_test.go
+++ b/pgtype/ext/satori-uuid/uuid_test.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	satori "github.com/jackc/pgx/pgtype/ext/satori-uuid"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	satori "github.com/jackc/pgx/v4/pgtype/ext/satori-uuid"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestUUIDTranscode(t *testing.T) {
diff --git a/pgtype/ext/shopspring-numeric/decimal.go b/pgtype/ext/shopspring-numeric/decimal.go
index 7c1cd770..0b63999b 100644
--- a/pgtype/ext/shopspring-numeric/decimal.go
+++ b/pgtype/ext/shopspring-numeric/decimal.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 	"github.com/shopspring/decimal"
 )
 
diff --git a/pgtype/ext/shopspring-numeric/decimal_test.go b/pgtype/ext/shopspring-numeric/decimal_test.go
index b237478d..2af39e1d 100644
--- a/pgtype/ext/shopspring-numeric/decimal_test.go
+++ b/pgtype/ext/shopspring-numeric/decimal_test.go
@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	shopspring "github.com/jackc/pgx/pgtype/ext/shopspring-numeric"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	shopspring "github.com/jackc/pgx/v4/pgtype/ext/shopspring-numeric"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 	"github.com/shopspring/decimal"
 )
 
diff --git a/pgtype/float4_array_test.go b/pgtype/float4_array_test.go
index 4d6511b4..24d544b6 100644
--- a/pgtype/float4_array_test.go
+++ b/pgtype/float4_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestFloat4ArrayTranscode(t *testing.T) {
diff --git a/pgtype/float4_test.go b/pgtype/float4_test.go
index 2ed8d05d..4779b357 100644
--- a/pgtype/float4_test.go
+++ b/pgtype/float4_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestFloat4Transcode(t *testing.T) {
diff --git a/pgtype/float8_array_test.go b/pgtype/float8_array_test.go
index ff8e3b26..b3e7a197 100644
--- a/pgtype/float8_array_test.go
+++ b/pgtype/float8_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestFloat8ArrayTranscode(t *testing.T) {
diff --git a/pgtype/float8_test.go b/pgtype/float8_test.go
index 46fc8d5d..15092916 100644
--- a/pgtype/float8_test.go
+++ b/pgtype/float8_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestFloat8Transcode(t *testing.T) {
diff --git a/pgtype/hstore_array_test.go b/pgtype/hstore_array_test.go
index 849b5835..bc45cbdf 100644
--- a/pgtype/hstore_array_test.go
+++ b/pgtype/hstore_array_test.go
@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestHstoreArrayTranscode(t *testing.T) {
diff --git a/pgtype/hstore_test.go b/pgtype/hstore_test.go
index d76c9942..71fd2355 100644
--- a/pgtype/hstore_test.go
+++ b/pgtype/hstore_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestHstoreTranscode(t *testing.T) {
diff --git a/pgtype/inet_array_test.go b/pgtype/inet_array_test.go
index ca528ed3..4e93d0f5 100644
--- a/pgtype/inet_array_test.go
+++ b/pgtype/inet_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInetArrayTranscode(t *testing.T) {
diff --git a/pgtype/inet_test.go b/pgtype/inet_test.go
index 32d66999..ee93873b 100644
--- a/pgtype/inet_test.go
+++ b/pgtype/inet_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInetTranscode(t *testing.T) {
diff --git a/pgtype/int2_array_test.go b/pgtype/int2_array_test.go
index 0fe763c1..fb4f0d60 100644
--- a/pgtype/int2_array_test.go
+++ b/pgtype/int2_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt2ArrayTranscode(t *testing.T) {
diff --git a/pgtype/int2_test.go b/pgtype/int2_test.go
index d20bf0ed..ff4732f7 100644
--- a/pgtype/int2_test.go
+++ b/pgtype/int2_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt2Transcode(t *testing.T) {
diff --git a/pgtype/int4_array_test.go b/pgtype/int4_array_test.go
index f0418600..06772cf6 100644
--- a/pgtype/int4_array_test.go
+++ b/pgtype/int4_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt4ArrayTranscode(t *testing.T) {
diff --git a/pgtype/int4_test.go b/pgtype/int4_test.go
index 02f5409f..6b23c5a9 100644
--- a/pgtype/int4_test.go
+++ b/pgtype/int4_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt4Transcode(t *testing.T) {
diff --git a/pgtype/int4range_test.go b/pgtype/int4range_test.go
index 961678bb..95d448f0 100644
--- a/pgtype/int4range_test.go
+++ b/pgtype/int4range_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt4rangeTranscode(t *testing.T) {
diff --git a/pgtype/int8_array_test.go b/pgtype/int8_array_test.go
index 2ca65173..c2d914ab 100644
--- a/pgtype/int8_array_test.go
+++ b/pgtype/int8_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt8ArrayTranscode(t *testing.T) {
diff --git a/pgtype/int8_test.go b/pgtype/int8_test.go
index 0b3bb3eb..a5f80f42 100644
--- a/pgtype/int8_test.go
+++ b/pgtype/int8_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt8Transcode(t *testing.T) {
diff --git a/pgtype/int8range_test.go b/pgtype/int8range_test.go
index f33ae4d8..01af48bb 100644
--- a/pgtype/int8range_test.go
+++ b/pgtype/int8range_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestInt8rangeTranscode(t *testing.T) {
diff --git a/pgtype/interval_test.go b/pgtype/interval_test.go
index 76ea3240..7cafb0ae 100644
--- a/pgtype/interval_test.go
+++ b/pgtype/interval_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestIntervalTranscode(t *testing.T) {
diff --git a/pgtype/json_test.go b/pgtype/json_test.go
index 38494841..bb0f1b20 100644
--- a/pgtype/json_test.go
+++ b/pgtype/json_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestJSONTranscode(t *testing.T) {
diff --git a/pgtype/jsonb_test.go b/pgtype/jsonb_test.go
index afc51019..73656c76 100644
--- a/pgtype/jsonb_test.go
+++ b/pgtype/jsonb_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestJSONBTranscode(t *testing.T) {
diff --git a/pgtype/line_test.go b/pgtype/line_test.go
index 077afe6b..5f0a58a3 100644
--- a/pgtype/line_test.go
+++ b/pgtype/line_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestLineTranscode(t *testing.T) {
diff --git a/pgtype/lseg_test.go b/pgtype/lseg_test.go
index 0a25090a..100bdf0f 100644
--- a/pgtype/lseg_test.go
+++ b/pgtype/lseg_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestLsegTranscode(t *testing.T) {
diff --git a/pgtype/macaddr_array_test.go b/pgtype/macaddr_array_test.go
index d4bb2f01..cf07ebf6 100644
--- a/pgtype/macaddr_array_test.go
+++ b/pgtype/macaddr_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestMacaddrArrayTranscode(t *testing.T) {
diff --git a/pgtype/macaddr_test.go b/pgtype/macaddr_test.go
index 5d329249..a08671c0 100644
--- a/pgtype/macaddr_test.go
+++ b/pgtype/macaddr_test.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestMacaddrTranscode(t *testing.T) {
diff --git a/pgtype/name_test.go b/pgtype/name_test.go
index ec0820c4..75d7b95a 100644
--- a/pgtype/name_test.go
+++ b/pgtype/name_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestNameTranscode(t *testing.T) {
diff --git a/pgtype/numeric_array_test.go b/pgtype/numeric_array_test.go
index 22ee1bc4..b17a6461 100644
--- a/pgtype/numeric_array_test.go
+++ b/pgtype/numeric_array_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestNumericArrayTranscode(t *testing.T) {
diff --git a/pgtype/numeric_test.go b/pgtype/numeric_test.go
index 9d7d83d6..b723cc56 100644
--- a/pgtype/numeric_test.go
+++ b/pgtype/numeric_test.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 // For test purposes only. Note that it does not normalize values. e.g. (Int: 1, Exp: 3) will not equal (Int: 1000, Exp: 0)
diff --git a/pgtype/numrange_test.go b/pgtype/numrange_test.go
index ccc794d5..610447fe 100644
--- a/pgtype/numrange_test.go
+++ b/pgtype/numrange_test.go
@@ -4,8 +4,8 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestNumrangeTranscode(t *testing.T) {
diff --git a/pgtype/oid_value_test.go b/pgtype/oid_value_test.go
index f5ff16cf..462a5a28 100644
--- a/pgtype/oid_value_test.go
+++ b/pgtype/oid_value_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestOIDValueTranscode(t *testing.T) {
diff --git a/pgtype/path_test.go b/pgtype/path_test.go
index bc2d7435..16e781f5 100644
--- a/pgtype/path_test.go
+++ b/pgtype/path_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestPathTranscode(t *testing.T) {
diff --git a/pgtype/pgtype_test.go b/pgtype/pgtype_test.go
index f7e743b2..400c0591 100644
--- a/pgtype/pgtype_test.go
+++ b/pgtype/pgtype_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	_ "github.com/jackc/pgx/stdlib"
+	_ "github.com/jackc/pgx/v4/stdlib"
 	_ "github.com/lib/pq"
 )
 
diff --git a/pgtype/point_test.go b/pgtype/point_test.go
index af70b38b..017bfc03 100644
--- a/pgtype/point_test.go
+++ b/pgtype/point_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestPointTranscode(t *testing.T) {
diff --git a/pgtype/polygon_test.go b/pgtype/polygon_test.go
index 5ff3bbb3..3bafebfc 100644
--- a/pgtype/polygon_test.go
+++ b/pgtype/polygon_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestPolygonTranscode(t *testing.T) {
diff --git a/pgtype/qchar_test.go b/pgtype/qchar_test.go
index 057a557f..3b50bb3e 100644
--- a/pgtype/qchar_test.go
+++ b/pgtype/qchar_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestQCharTranscode(t *testing.T) {
diff --git a/pgtype/record_test.go b/pgtype/record_test.go
index a4fc1e5d..5de8af31 100644
--- a/pgtype/record_test.go
+++ b/pgtype/record_test.go
@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestRecordTranscode(t *testing.T) {
diff --git a/pgtype/testutil/testutil.go b/pgtype/testutil/testutil.go
index 0d653394..121eb754 100644
--- a/pgtype/testutil/testutil.go
+++ b/pgtype/testutil/testutil.go
@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
-	_ "github.com/jackc/pgx/stdlib"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
+	_ "github.com/jackc/pgx/v4/stdlib"
 	_ "github.com/lib/pq"
 )
 
diff --git a/pgtype/text_array_test.go b/pgtype/text_array_test.go
index 105d9353..b03312d9 100644
--- a/pgtype/text_array_test.go
+++ b/pgtype/text_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTextArrayTranscode(t *testing.T) {
diff --git a/pgtype/text_test.go b/pgtype/text_test.go
index bd971807..53f4bd7e 100644
--- a/pgtype/text_test.go
+++ b/pgtype/text_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTextTranscode(t *testing.T) {
diff --git a/pgtype/tid_test.go b/pgtype/tid_test.go
index 9185cb31..cd753ab4 100644
--- a/pgtype/tid_test.go
+++ b/pgtype/tid_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTIDTranscode(t *testing.T) {
diff --git a/pgtype/timestamp_array_test.go b/pgtype/timestamp_array_test.go
index 5821f43a..002d1ca4 100644
--- a/pgtype/timestamp_array_test.go
+++ b/pgtype/timestamp_array_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTimestampArrayTranscode(t *testing.T) {
diff --git a/pgtype/timestamp_test.go b/pgtype/timestamp_test.go
index 267f1a7e..732f3cc2 100644
--- a/pgtype/timestamp_test.go
+++ b/pgtype/timestamp_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTimestampTranscode(t *testing.T) {
diff --git a/pgtype/timestamptz_array_test.go b/pgtype/timestamptz_array_test.go
index 8d7ea4c9..ac9975f0 100644
--- a/pgtype/timestamptz_array_test.go
+++ b/pgtype/timestamptz_array_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTimestamptzArrayTranscode(t *testing.T) {
diff --git a/pgtype/timestamptz_test.go b/pgtype/timestamptz_test.go
index c326802d..f522117b 100644
--- a/pgtype/timestamptz_test.go
+++ b/pgtype/timestamptz_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTimestamptzTranscode(t *testing.T) {
diff --git a/pgtype/tsrange_test.go b/pgtype/tsrange_test.go
index 78eb1cd3..6215e318 100644
--- a/pgtype/tsrange_test.go
+++ b/pgtype/tsrange_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTsrangeTranscode(t *testing.T) {
diff --git a/pgtype/tstzrange_test.go b/pgtype/tstzrange_test.go
index a27ddd3a..ddaf798b 100644
--- a/pgtype/tstzrange_test.go
+++ b/pgtype/tstzrange_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestTstzrangeTranscode(t *testing.T) {
diff --git a/pgtype/uuid_array_test.go b/pgtype/uuid_array_test.go
index ee9d3dfa..6ec6acfb 100644
--- a/pgtype/uuid_array_test.go
+++ b/pgtype/uuid_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestUUIDArrayTranscode(t *testing.T) {
diff --git a/pgtype/uuid_test.go b/pgtype/uuid_test.go
index 162d999f..9d95c10c 100644
--- a/pgtype/uuid_test.go
+++ b/pgtype/uuid_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestUUIDTranscode(t *testing.T) {
diff --git a/pgtype/varbit_test.go b/pgtype/varbit_test.go
index 6c813aae..8ea282eb 100644
--- a/pgtype/varbit_test.go
+++ b/pgtype/varbit_test.go
@@ -3,8 +3,8 @@ package pgtype_test
 import (
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestVarbitTranscode(t *testing.T) {
diff --git a/pgtype/varchar_array_test.go b/pgtype/varchar_array_test.go
index 9fb0960f..b836664f 100644
--- a/pgtype/varchar_array_test.go
+++ b/pgtype/varchar_array_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestVarcharArrayTranscode(t *testing.T) {
diff --git a/pgtype/xid_test.go b/pgtype/xid_test.go
index 594d1214..34801e1f 100644
--- a/pgtype/xid_test.go
+++ b/pgtype/xid_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/jackc/pgx/pgtype"
-	"github.com/jackc/pgx/pgtype/testutil"
+	"github.com/jackc/pgx/v4/pgtype"
+	"github.com/jackc/pgx/v4/pgtype/testutil"
 )
 
 func TestXIDTranscode(t *testing.T) {
diff --git a/pool/common_test.go b/pool/common_test.go
index 9e7ab947..b5a0682f 100644
--- a/pool/common_test.go
+++ b/pool/common_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pool/conn.go b/pool/conn.go
index 7b11c699..616f1f40 100644
--- a/pool/conn.go
+++ b/pool/conn.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/jackc/puddle"
 )
 
diff --git a/pool/conn_test.go b/pool/conn_test.go
index b4d6adda..de39dd7b 100644
--- a/pool/conn_test.go
+++ b/pool/conn_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jackc/pgx/pool"
+	"github.com/jackc/pgx/v4/pool"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pool/pool.go b/pool/pool.go
index 6b1baef9..24587705 100644
--- a/pool/pool.go
+++ b/pool/pool.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 	"github.com/jackc/puddle"
 )
 
diff --git a/pool/pool_test.go b/pool/pool_test.go
index 12533d12..649f0cfc 100644
--- a/pool/pool_test.go
+++ b/pool/pool_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/pool"
+	"github.com/jackc/pgx/v4/pool"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pool/rows.go b/pool/rows.go
index 43a3192b..930f21e1 100644
--- a/pool/rows.go
+++ b/pool/rows.go
@@ -1,7 +1,7 @@
 package pool
 
 import (
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 type errRows struct {
diff --git a/pool/tx.go b/pool/tx.go
index 9f7b231a..c9c15b5f 100644
--- a/pool/tx.go
+++ b/pool/tx.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 type Tx struct {
diff --git a/pool/tx_test.go b/pool/tx_test.go
index 14ea739a..7195dae6 100644
--- a/pool/tx_test.go
+++ b/pool/tx_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/jackc/pgx/pool"
+	"github.com/jackc/pgx/v4/pool"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/query.go b/query.go
index 7cf654ed..d9e8c07e 100644
--- a/query.go
+++ b/query.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 // Rows is the result set returned from *Conn.Query. Rows must be closed before
diff --git a/query_test.go b/query_test.go
index c366c04e..bd94e091 100644
--- a/query_test.go
+++ b/query_test.go
@@ -13,9 +13,9 @@ import (
 
 	"github.com/cockroachdb/apd"
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
-	satori "github.com/jackc/pgx/pgtype/ext/satori-uuid"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
+	satori "github.com/jackc/pgx/v4/pgtype/ext/satori-uuid"
 	uuid "github.com/satori/go.uuid"
 	"github.com/shopspring/decimal"
 	errors "golang.org/x/xerrors"
diff --git a/replication.go b/replication.go
index 644db2e6..7647db3e 100644
--- a/replication.go
+++ b/replication.go
@@ -12,7 +12,7 @@ import (
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgio"
 	"github.com/jackc/pgproto3/v2"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 const (
diff --git a/replication_test.go b/replication_test.go
index 070f0ed5..cd9b917a 100644
--- a/replication_test.go
+++ b/replication_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 // This function uses a postgresql 9.6 specific column
diff --git a/sql_test.go b/sql_test.go
index dd036035..25e3576d 100644
--- a/sql_test.go
+++ b/sql_test.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 func TestQueryArgs(t *testing.T) {
diff --git a/stdlib/opendb.go b/stdlib/opendb.go
index b4a20015..215aa146 100644
--- a/stdlib/opendb.go
+++ b/stdlib/opendb.go
@@ -7,7 +7,7 @@ import (
 	"database/sql"
 	"database/sql/driver"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 // OptionOpenDB options for configuring the driver when opening a new db pool.
diff --git a/stdlib/sql.go b/stdlib/sql.go
index 93507cbd..3868591c 100644
--- a/stdlib/sql.go
+++ b/stdlib/sql.go
@@ -83,8 +83,8 @@ import (
 	errors "golang.org/x/xerrors"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgtype"
 )
 
 // oids that map to intrinsic database/sql types. These will be allowed to be
diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go
index 2338e97f..35721f1e 100644
--- a/stdlib/sql_test.go
+++ b/stdlib/sql_test.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgproto3"
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/pgmock"
-	"github.com/jackc/pgx/stdlib"
+	"github.com/jackc/pgproto3/v2"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgmock"
+	"github.com/jackc/pgx/v4/stdlib"
 )
 
 func closeDB(t *testing.T, db *sql.DB) {
diff --git a/stdlib/stdlibutil110_test.go b/stdlib/stdlibutil110_test.go
index 52ae1594..d87c9b64 100644
--- a/stdlib/stdlibutil110_test.go
+++ b/stdlib/stdlibutil110_test.go
@@ -6,8 +6,8 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/jackc/pgx"
-	"github.com/jackc/pgx/stdlib"
+	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/stdlib"
 )
 
 func openDB(t *testing.T) *sql.DB {
diff --git a/stress_test.go b/stress_test.go
index e0292d3b..285973f0 100644
--- a/stress_test.go
+++ b/stress_test.go
@@ -12,7 +12,7 @@ package pgx_test
 // 	"github.com/pkg/errors"
 
 // 	"github.com/jackc/fake"
-// 	"github.com/jackc/pgx"
+// 	"github.com/jackc/pgx/v4"
 // 	"github.com/jackc/pgconn"
 // )
 
diff --git a/tx_test.go b/tx_test.go
index e33a9c27..22ca14c3 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 func TestTransactionSuccessfulCommit(t *testing.T) {
diff --git a/values.go b/values.go
index fc36f678..86392c4c 100644
--- a/values.go
+++ b/values.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgio"
-	"github.com/jackc/pgx/pgtype"
+	"github.com/jackc/pgx/v4/pgtype"
 	"github.com/pkg/errors"
 )
 
diff --git a/values_test.go b/values_test.go
index 7f3cc359..48c36628 100644
--- a/values_test.go
+++ b/values_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx"
+	"github.com/jackc/pgx/v4"
 )
 
 func TestDateTranscode(t *testing.T) {