diff --git a/internal/nbbconn/bufferqueue.go b/internal/nbconn/bufferqueue.go
similarity index 98%
rename from internal/nbbconn/bufferqueue.go
rename to internal/nbconn/bufferqueue.go
index 65a895bc..fff6dc5b 100644
--- a/internal/nbbconn/bufferqueue.go
+++ b/internal/nbconn/bufferqueue.go
@@ -1,4 +1,4 @@
-package nbbconn
+package nbconn
 
 import (
 	"sync"
diff --git a/internal/nbbconn/nbbconn.go b/internal/nbconn/nbconn.go
similarity index 97%
rename from internal/nbbconn/nbbconn.go
rename to internal/nbconn/nbconn.go
index d659c6cc..5d07b65f 100644
--- a/internal/nbbconn/nbbconn.go
+++ b/internal/nbconn/nbconn.go
@@ -1,5 +1,5 @@
-// Package nbbconn implements a non-blocking, buffered net.Conn wrapper.
-package nbbconn
+// Package nbconn implements a non-blocking net.Conn wrapper.
+package nbconn
 
 import (
 	"errors"
@@ -19,7 +19,7 @@ const fakeNonblockingWaitDuration = 100 * time.Millisecond
 
 var NonBlockingDeadline = time.Date(1900, 1, 1, 0, 0, 0, 0, time.UTC)
 
-// Conn is a non-blocking, buffered net.Conn wrapper. It implements net.Conn.
+// Conn is a non-blocking net.Conn wrapper. It implements net.Conn.
 //
 // It is designed to solve three problems.
 //
diff --git a/internal/nbbconn/nbbconn_test.go b/internal/nbconn/nbconn_test.go
similarity index 88%
rename from internal/nbbconn/nbbconn_test.go
rename to internal/nbconn/nbconn_test.go
index 2898cd25..fd5921a2 100644
--- a/internal/nbbconn/nbbconn_test.go
+++ b/internal/nbconn/nbconn_test.go
@@ -1,11 +1,11 @@
-package nbbconn_test
+package nbconn_test
 
 import (
 	"net"
 	"testing"
 	"time"
 
-	"github.com/jackc/pgx/v5/internal/nbbconn"
+	"github.com/jackc/pgx/v5/internal/nbconn"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,7 +16,7 @@ func TestWriteIsBuffered(t *testing.T) {
 		remote.Close()
 	}()
 
-	conn := nbbconn.New(local)
+	conn := nbconn.New(local)
 
 	// net.Pipe is synchronous so the Write would block if not buffered.
 	writeBuf := []byte("test")
@@ -44,7 +44,7 @@ func TestReadFlushesWriteBuffer(t *testing.T) {
 		remote.Close()
 	}()
 
-	conn := nbbconn.New(local)
+	conn := nbconn.New(local)
 
 	writeBuf := []byte("test")
 	n, err := conn.Write(writeBuf)
@@ -77,7 +77,7 @@ func TestCloseFlushesWriteBuffer(t *testing.T) {
 		remote.Close()
 	}()
 
-	conn := nbbconn.New(local)
+	conn := nbconn.New(local)
 
 	writeBuf := []byte("test")
 	n, err := conn.Write(writeBuf)
@@ -104,14 +104,14 @@ func TestNonBlockingRead(t *testing.T) {
 		remote.Close()
 	}()
 
-	conn := nbbconn.New(local)
+	conn := nbconn.New(local)
 
-	err := conn.SetReadDeadline(nbbconn.NonBlockingDeadline)
+	err := conn.SetReadDeadline(nbconn.NonBlockingDeadline)
 	require.NoError(t, err)
 
 	buf := make([]byte, 4)
 	n, err := conn.Read(buf)
-	require.ErrorIs(t, err, nbbconn.ErrWouldBlock)
+	require.ErrorIs(t, err, nbconn.ErrWouldBlock)
 	require.EqualValues(t, 0, n)
 
 	errChan := make(chan error, 1)
diff --git a/pgconn/pgconn.go b/pgconn/pgconn.go
index 9ecd8f11..bac08db0 100644
--- a/pgconn/pgconn.go
+++ b/pgconn/pgconn.go
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgx/v5/internal/iobufpool"
-	"github.com/jackc/pgx/v5/internal/nbbconn"
+	"github.com/jackc/pgx/v5/internal/nbconn"
 	"github.com/jackc/pgx/v5/internal/pgio"
 	"github.com/jackc/pgx/v5/pgconn/internal/ctxwatch"
 	"github.com/jackc/pgx/v5/pgproto3"
@@ -248,8 +248,8 @@ func connect(ctx context.Context, config *Config, fallbackConfig *FallbackConfig
 		pgConn.contextWatcher.Watch(ctx)
 	}
 
-	pgConn.conn = nbbconn.New(pgConn.conn)
-	pgConn.contextWatcher.Unwatch() // context watcher should watch nbbconn
+	pgConn.conn = nbconn.New(pgConn.conn)
+	pgConn.contextWatcher.Unwatch() // context watcher should watch nbconn
 	pgConn.contextWatcher = newContextWatcher(pgConn.conn)
 	pgConn.contextWatcher.Watch(ctx)
 
@@ -428,7 +428,7 @@ func (pgConn *PgConn) peekMessage() (pgproto3.BackendMessage, error) {
 	msg, err := pgConn.frontend.Receive()
 
 	if err != nil {
-		if errors.Is(err, nbbconn.ErrWouldBlock) {
+		if errors.Is(err, nbconn.ErrWouldBlock) {
 			return nil, err
 		}
 
@@ -1143,7 +1143,7 @@ func (pgConn *PgConn) CopyFrom(ctx context.Context, r io.Reader, sql string) (Co
 		return CommandTag{}, err
 	}
 
-	err = pgConn.conn.SetReadDeadline(nbbconn.NonBlockingDeadline)
+	err = pgConn.conn.SetReadDeadline(nbconn.NonBlockingDeadline)
 	if err != nil {
 		pgConn.asyncClose()
 		return CommandTag{}, err
@@ -1185,7 +1185,7 @@ func (pgConn *PgConn) CopyFrom(ctx context.Context, r io.Reader, sql string) (Co
 		for pgErr == nil {
 			msg, err := pgConn.receiveMessage()
 			if err != nil {
-				if errors.Is(err, nbbconn.ErrWouldBlock) {
+				if errors.Is(err, nbconn.ErrWouldBlock) {
 					break
 				}
 				pgConn.asyncClose()