Repository: sqlc-dev/sqlc
Pull request #2523 (2023-07-25 20:00:01)

chore!: Rename kyleconroy/sqlc to sqlc-dev/sqlc
## What's changing?

A few weeks ago we announced that [we're working on sqlc full time](https://sqlc.dev/posts/2023/07/06/working-on-sqlc-full-time/). We've created a new GitHub organization, sqlc-dev, to house all of our open-source code. Most repositories were migrated a few weeks ago. This is the last repository to migrate.

## What do I need to do after the transfer?

Nothing as of right now, but things will change next week once we release v1.20.0. When upgrading, you will need to change any imports paths from `github.com/kyleconroy/sqlc` to `github.com/sqlc-dev/sqlc`.

To install that release, you'll do:

```
go install github.com/sqlc-dev/sqlc/cmd/sqlc@v1.20.0
```

If you want to use sqlc in your Go module, you'll do

```
go get github.com/sqlc-dev/sqlc@v1.20.0
```

All previous versions of sqlc will be installed using the old import paths. Those commands will continue to work once the repository has been transferred to the sqlc-dev organization.

If you have an open pull-request, you may need to rebase as well.

----

## Description

The majority of this change was done using the excellent [go-imports-rename](https://github.com/sirkon/go-imports-rename) tool.

```
go install github.com/sirkon/go-imports-rename@latest
go-imports-rename --save 'github.com/kyleconroy/sqlc => github.com/sqlc-dev/sqlc'
```


Patch:
diff --git a/cmd/sqlc-gen-json/main.go b/cmd/sqlc-gen-json/main.go
index a66188280..421a14e06 100644
--- a/cmd/sqlc-gen-json/main.go
+++ b/cmd/sqlc-gen-json/main.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/json"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/json"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func main() {
diff --git a/cmd/sqlc/main.go b/cmd/sqlc/main.go
index 24dd1bcc5..f003db484 100644
--- a/cmd/sqlc/main.go
+++ b/cmd/sqlc/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/kyleconroy/sqlc/internal/cmd"
+	"github.com/sqlc-dev/sqlc/internal/cmd"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index daa58b855..d333e0bcc 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/kyleconroy/sqlc
+module github.com/sqlc-dev/sqlc
 
 go 1.20
 
diff --git a/internal/bundler/metadata.go b/internal/bundler/metadata.go
index 415b131ef..18d41e9f6 100644
--- a/internal/bundler/metadata.go
+++ b/internal/bundler/metadata.go
@@ -3,7 +3,7 @@ package bundler
 import (
 	"runtime"
 
-	"github.com/kyleconroy/sqlc/internal/info"
+	"github.com/sqlc-dev/sqlc/internal/info"
 )
 
 func projectMetadata() ([][2]string, error) {
diff --git a/internal/bundler/multipart.go b/internal/bundler/multipart.go
index a755bbfcf..dd4eed10a 100644
--- a/internal/bundler/multipart.go
+++ b/internal/bundler/multipart.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 )
 
 func writeInputs(w *multipart.Writer, file string, conf *config.Config) error {
diff --git a/internal/bundler/upload.go b/internal/bundler/upload.go
index 556fb7942..0d1d508f9 100644
--- a/internal/bundler/upload.go
+++ b/internal/bundler/upload.go
@@ -10,7 +10,7 @@ import (
 	"net/http/httputil"
 	"os"
 
-	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/config"
 )
 
 type Uploader struct {
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
index aec6eb121..3548ce0df 100644
--- a/internal/cmd/cmd.go
+++ b/internal/cmd/cmd.go
@@ -17,11 +17,11 @@ import (
 	"github.com/spf13/pflag"
 	"gopkg.in/yaml.v3"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/info"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/tracer"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/info"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/tracer"
 )
 
 func init() {
diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go
index ebd98e073..b38e73098 100644
--- a/internal/cmd/generate.go
+++ b/internal/cmd/generate.go
@@ -15,21 +15,21 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/status"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/golang"
-	"github.com/kyleconroy/sqlc/internal/codegen/json"
-	"github.com/kyleconroy/sqlc/internal/compiler"
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/config/convert"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/ext"
-	"github.com/kyleconroy/sqlc/internal/ext/process"
-	"github.com/kyleconroy/sqlc/internal/ext/wasm"
-	"github.com/kyleconroy/sqlc/internal/info"
-	"github.com/kyleconroy/sqlc/internal/multierr"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/plugin"
-	"github.com/kyleconroy/sqlc/internal/remote"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/codegen/golang"
+	"github.com/sqlc-dev/sqlc/internal/codegen/json"
+	"github.com/sqlc-dev/sqlc/internal/compiler"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/config/convert"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/ext"
+	"github.com/sqlc-dev/sqlc/internal/ext/process"
+	"github.com/sqlc-dev/sqlc/internal/ext/wasm"
+	"github.com/sqlc-dev/sqlc/internal/info"
+	"github.com/sqlc-dev/sqlc/internal/multierr"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/remote"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 )
 
 const errMessageNoVersion = `The configuration file must have a version number.
diff --git a/internal/cmd/package.go b/internal/cmd/package.go
index 63a4e0050..4b3318d91 100644
--- a/internal/cmd/package.go
+++ b/internal/cmd/package.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/kyleconroy/sqlc/internal/bundler"
+	"github.com/sqlc-dev/sqlc/internal/bundler"
 )
 
 func createPkg(ctx context.Context, e Env, dir, filename string, stderr io.Writer) error {
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
index de5bfb76c..20b68ca17 100644
--- a/internal/cmd/shim.go
+++ b/internal/cmd/shim.go
@@ -3,12 +3,12 @@ package cmd
 import (
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/compiler"
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/config/convert"
-	"github.com/kyleconroy/sqlc/internal/info"
-	"github.com/kyleconroy/sqlc/internal/plugin"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/compiler"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/config/convert"
+	"github.com/sqlc-dev/sqlc/internal/info"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func pluginOverride(r *compiler.Result, o config.Override) *plugin.Override {
diff --git a/internal/cmd/vet.go b/internal/cmd/vet.go
index 7abf104f7..57fee7c39 100644
--- a/internal/cmd/vet.go
+++ b/internal/cmd/vet.go
@@ -22,12 +22,12 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/plugin"
-	"github.com/kyleconroy/sqlc/internal/shfmt"
-	"github.com/kyleconroy/sqlc/internal/vet"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/shfmt"
+	"github.com/sqlc-dev/sqlc/internal/vet"
 )
 
 var ErrFailedChecks = errors.New("failed checks")
diff --git a/internal/codegen/golang/field.go b/internal/codegen/golang/field.go
index c8f6421e1..94dfc81d7 100644
--- a/internal/codegen/golang/field.go
+++ b/internal/codegen/golang/field.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type Field struct {
diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
index 260295d87..a35db188e 100644
--- a/internal/codegen/golang/gen.go
+++ b/internal/codegen/golang/gen.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type tmplCtx struct {
diff --git a/internal/codegen/golang/go_type.go b/internal/codegen/golang/go_type.go
index 30b8d1444..ac66f24e6 100644
--- a/internal/codegen/golang/go_type.go
+++ b/internal/codegen/golang/go_type.go
@@ -1,8 +1,8 @@
 package golang
 
 import (
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func addExtraGoStructTags(tags map[string]string, req *plugin.CodeGenRequest, col *plugin.Column) {
diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
index c1c4c9e76..cc747cc3d 100644
--- a/internal/codegen/golang/imports.go
+++ b/internal/codegen/golang/imports.go
@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type fileImports struct {
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
index 954d5cf60..c89d8ff3c 100644
--- a/internal/codegen/golang/mysql_type.go
+++ b/internal/codegen/golang/mysql_type.go
@@ -3,9 +3,9 @@ package golang
 import (
 	"log"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
index 3f1723cfd..ae3e1278a 100644
--- a/internal/codegen/golang/postgresql_type.go
+++ b/internal/codegen/golang/postgresql_type.go
@@ -5,9 +5,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func parseIdentifierString(name string) (*plugin.Identifier, error) {
diff --git a/internal/codegen/golang/query.go b/internal/codegen/golang/query.go
index aeb1c106a..e6bef868d 100644
--- a/internal/codegen/golang/query.go
+++ b/internal/codegen/golang/query.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type QueryValue struct {
diff --git a/internal/codegen/golang/result.go b/internal/codegen/golang/result.go
index f5ecd124a..5955e7ef1 100644
--- a/internal/codegen/golang/result.go
+++ b/internal/codegen/golang/result.go
@@ -5,10 +5,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/inflection"
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/inflection"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func buildEnums(req *plugin.CodeGenRequest) []Enum {
diff --git a/internal/codegen/golang/sqlite_type.go b/internal/codegen/golang/sqlite_type.go
index 168761f73..2581197fd 100644
--- a/internal/codegen/golang/sqlite_type.go
+++ b/internal/codegen/golang/sqlite_type.go
@@ -4,9 +4,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/codegen/sdk"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/codegen/sdk"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func sqliteType(req *plugin.CodeGenRequest, col *plugin.Column) string {
diff --git a/internal/codegen/golang/struct.go b/internal/codegen/golang/struct.go
index 16e4e4339..31904205e 100644
--- a/internal/codegen/golang/struct.go
+++ b/internal/codegen/golang/struct.go
@@ -5,7 +5,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type Struct struct {
diff --git a/internal/codegen/json/gen.go b/internal/codegen/json/gen.go
index 75ab3941c..d729fccaa 100644
--- a/internal/codegen/json/gen.go
+++ b/internal/codegen/json/gen.go
@@ -8,7 +8,7 @@ import (
 
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func parseOptions(req *plugin.CodeGenRequest) (*plugin.JSONCode, error) {
diff --git a/internal/codegen/sdk/sdk.go b/internal/codegen/sdk/sdk.go
index 2f97da1bb..415cbaaec 100644
--- a/internal/codegen/sdk/sdk.go
+++ b/internal/codegen/sdk/sdk.go
@@ -1,8 +1,8 @@
 package sdk
 
 import (
-	"github.com/kyleconroy/sqlc/internal/pattern"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/pattern"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func DataType(n *plugin.Identifier) string {
diff --git a/internal/compiler/compat.go b/internal/compiler/compat.go
index d546f992b..6fd10bac4 100644
--- a/internal/compiler/compat.go
+++ b/internal/compiler/compat.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 // This is mainly copy-pasted from internal/postgresql/parse.go
diff --git a/internal/compiler/compile.go b/internal/compiler/compile.go
index fa59a0669..5cbfab674 100644
--- a/internal/compiler/compile.go
+++ b/internal/compiler/compile.go
@@ -8,13 +8,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/migrations"
-	"github.com/kyleconroy/sqlc/internal/multierr"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/migrations"
+	"github.com/sqlc-dev/sqlc/internal/multierr"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 )
 
 // TODO: Rename this interface Engine
diff --git a/internal/compiler/engine.go b/internal/compiler/engine.go
index 3f2477703..032c1b0ba 100644
--- a/internal/compiler/engine.go
+++ b/internal/compiler/engine.go
@@ -3,12 +3,12 @@ package compiler
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/engine/dolphin"
-	"github.com/kyleconroy/sqlc/internal/engine/postgresql"
-	"github.com/kyleconroy/sqlc/internal/engine/sqlite"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/engine/dolphin"
+	"github.com/sqlc-dev/sqlc/internal/engine/postgresql"
+	"github.com/sqlc-dev/sqlc/internal/engine/sqlite"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 type Compiler struct {
diff --git a/internal/compiler/expand.go b/internal/compiler/expand.go
index da2c078a7..8ea2fd2d2 100644
--- a/internal/compiler/expand.go
+++ b/internal/compiler/expand.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/source"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/source"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 func (c *Compiler) expand(qc *QueryCatalog, raw *ast.RawStmt) ([]source.Edit, error) {
diff --git a/internal/compiler/find_params.go b/internal/compiler/find_params.go
index 40217d15d..41ffaf8ad 100644
--- a/internal/compiler/find_params.go
+++ b/internal/compiler/find_params.go
@@ -3,8 +3,8 @@ package compiler
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 func findParameters(root ast.Node) ([]paramRef, error) {
diff --git a/internal/compiler/output_columns.go b/internal/compiler/output_columns.go
index 9b14fb83c..665e8892f 100644
--- a/internal/compiler/output_columns.go
+++ b/internal/compiler/output_columns.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/lang"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/lang"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 // OutputColumns determines which columns a statement will output
@@ -513,7 +513,7 @@ func (c *Compiler) sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, erro
 					continue // TODO handle this correctly
 				default:
 					continue
-			}
+				}
 			case *ast.FuncCall:
 				funcCall = f
 			default:
diff --git a/internal/compiler/parse.go b/internal/compiler/parse.go
index 932df32d3..8354bd340 100644
--- a/internal/compiler/parse.go
+++ b/internal/compiler/parse.go
@@ -6,15 +6,15 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/opts"
-	"github.com/kyleconroy/sqlc/internal/source"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/rewrite"
-	"github.com/kyleconroy/sqlc/internal/sql/validate"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/source"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/rewrite"
+	"github.com/sqlc-dev/sqlc/internal/sql/validate"
 )
 
 var ErrUnsupportedStatementType = errors.New("parseQuery: unsupported statement type")
diff --git a/internal/compiler/query.go b/internal/compiler/query.go
index 9a2df0351..3505c1907 100644
--- a/internal/compiler/query.go
+++ b/internal/compiler/query.go
@@ -1,7 +1,7 @@
 package compiler
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type Function struct {
diff --git a/internal/compiler/query_catalog.go b/internal/compiler/query_catalog.go
index 2b6577c2e..5f3f2a57a 100644
--- a/internal/compiler/query_catalog.go
+++ b/internal/compiler/query_catalog.go
@@ -3,9 +3,9 @@ package compiler
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
-	"github.com/kyleconroy/sqlc/internal/sql/rewrite"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/rewrite"
 )
 
 type QueryCatalog struct {
diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go
index 309375203..8bf94460b 100644
--- a/internal/compiler/resolve.go
+++ b/internal/compiler/resolve.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
-	"github.com/kyleconroy/sqlc/internal/sql/named"
-	"github.com/kyleconroy/sqlc/internal/sql/rewrite"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/named"
+	"github.com/sqlc-dev/sqlc/internal/sql/rewrite"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func dataType(n *ast.TypeName) string {
@@ -257,7 +257,6 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 				}
 			}
 
-
 			for _, table := range tables {
 				schema := table.Schema
 				if schema == "" {
diff --git a/internal/compiler/result.go b/internal/compiler/result.go
index bf522bbaa..3647da630 100644
--- a/internal/compiler/result.go
+++ b/internal/compiler/result.go
@@ -1,7 +1,7 @@
 package compiler
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 type Result struct {
diff --git a/internal/compiler/to_column.go b/internal/compiler/to_column.go
index 14dee0ac2..198f73502 100644
--- a/internal/compiler/to_column.go
+++ b/internal/compiler/to_column.go
@@ -3,8 +3,8 @@ package compiler
 import (
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 func isArray(n *ast.TypeName) bool {
diff --git a/internal/config/override.go b/internal/config/override.go
index 0766d6e0a..a2edb94cf 100644
--- a/internal/config/override.go
+++ b/internal/config/override.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/pattern"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/pattern"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type Override struct {
diff --git a/internal/debug/dump.go b/internal/debug/dump.go
index a0d30d95c..6921ecb67 100644
--- a/internal/debug/dump.go
+++ b/internal/debug/dump.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	"github.com/kyleconroy/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/opts"
 )
 
 var Active bool
@@ -31,4 +31,4 @@ func DumpAsJSON(a any) {
 		out, _ := json.MarshalIndent(a, "", "  ")
 		fmt.Printf("%s\n", out)
 	}
-}
\ No newline at end of file
+}
diff --git a/internal/engine/dolphin/catalog.go b/internal/engine/dolphin/catalog.go
index f3368ccc6..e7872f7c9 100644
--- a/internal/engine/dolphin/catalog.go
+++ b/internal/engine/dolphin/catalog.go
@@ -1,7 +1,7 @@
 package dolphin
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func NewCatalog() *catalog.Catalog {
diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
index 132be0b3f..b610f0e68 100644
--- a/internal/engine/dolphin/convert.go
+++ b/internal/engine/dolphin/convert.go
@@ -10,8 +10,8 @@ import (
 	driver "github.com/pingcap/tidb/parser/test_driver"
 	"github.com/pingcap/tidb/parser/types"
 
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type cc struct {
diff --git a/internal/engine/dolphin/parse.go b/internal/engine/dolphin/parse.go
index 3635d4cb1..676362c44 100644
--- a/internal/engine/dolphin/parse.go
+++ b/internal/engine/dolphin/parse.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pingcap/tidb/parser"
 	_ "github.com/pingcap/tidb/parser/test_driver"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func NewParser() *Parser {
diff --git a/internal/engine/dolphin/stdlib.go b/internal/engine/dolphin/stdlib.go
index 7fa567729..37de5d7cb 100644
--- a/internal/engine/dolphin/stdlib.go
+++ b/internal/engine/dolphin/stdlib.go
@@ -1,8 +1,8 @@
 package dolphin
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func defaultSchema(name string) *catalog.Schema {
diff --git a/internal/engine/dolphin/utils.go b/internal/engine/dolphin/utils.go
index a05ef00b6..dd3b8f58d 100644
--- a/internal/engine/dolphin/utils.go
+++ b/internal/engine/dolphin/utils.go
@@ -4,7 +4,7 @@ import (
 	pcast "github.com/pingcap/tidb/parser/ast"
 	"github.com/pingcap/tidb/parser/mysql"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func parseTableName(n *pcast.TableName) *ast.TableName {
diff --git a/internal/engine/postgresql/catalog.go b/internal/engine/postgresql/catalog.go
index 3b3728714..3c262122a 100644
--- a/internal/engine/postgresql/catalog.go
+++ b/internal/engine/postgresql/catalog.go
@@ -1,6 +1,6 @@
 package postgresql
 
-import "github.com/kyleconroy/sqlc/internal/sql/catalog"
+import "github.com/sqlc-dev/sqlc/internal/sql/catalog"
 
 // toPointer converts an int to a pointer without a temporary
 // variable at the call-site, and is used by the generated schemas
diff --git a/internal/engine/postgresql/contrib/adminpack.go b/internal/engine/postgresql/contrib/adminpack.go
index 559e904bc..1e47e1243 100644
--- a/internal/engine/postgresql/contrib/adminpack.go
+++ b/internal/engine/postgresql/contrib/adminpack.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsAdminpack = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/amcheck.go b/internal/engine/postgresql/contrib/amcheck.go
index 5dd4d5892..156cb43eb 100644
--- a/internal/engine/postgresql/contrib/amcheck.go
+++ b/internal/engine/postgresql/contrib/amcheck.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsAmcheck = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/btree_gin.go b/internal/engine/postgresql/contrib/btree_gin.go
index 205fc061f..54a5000a2 100644
--- a/internal/engine/postgresql/contrib/btree_gin.go
+++ b/internal/engine/postgresql/contrib/btree_gin.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsBtreeGin = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/btree_gist.go b/internal/engine/postgresql/contrib/btree_gist.go
index ccb4fb77f..b5b3ddaf6 100644
--- a/internal/engine/postgresql/contrib/btree_gist.go
+++ b/internal/engine/postgresql/contrib/btree_gist.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsBtreeGist = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/citext.go b/internal/engine/postgresql/contrib/citext.go
index 1bd9e096d..d5749cacd 100644
--- a/internal/engine/postgresql/contrib/citext.go
+++ b/internal/engine/postgresql/contrib/citext.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsCitext = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/cube.go b/internal/engine/postgresql/contrib/cube.go
index b974b6a9c..cb883db65 100644
--- a/internal/engine/postgresql/contrib/cube.go
+++ b/internal/engine/postgresql/contrib/cube.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsCube = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/dblink.go b/internal/engine/postgresql/contrib/dblink.go
index 09400b868..b24cd16a5 100644
--- a/internal/engine/postgresql/contrib/dblink.go
+++ b/internal/engine/postgresql/contrib/dblink.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsDblink = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/earthdistance.go b/internal/engine/postgresql/contrib/earthdistance.go
index 8301cd845..5c0bfa7cd 100644
--- a/internal/engine/postgresql/contrib/earthdistance.go
+++ b/internal/engine/postgresql/contrib/earthdistance.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsEarthdistance = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/file_fdw.go b/internal/engine/postgresql/contrib/file_fdw.go
index 3a3e1dfa6..36d6db31d 100644
--- a/internal/engine/postgresql/contrib/file_fdw.go
+++ b/internal/engine/postgresql/contrib/file_fdw.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsFileFdw = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/fuzzystrmatch.go b/internal/engine/postgresql/contrib/fuzzystrmatch.go
index fc342f657..fcf0ddea8 100644
--- a/internal/engine/postgresql/contrib/fuzzystrmatch.go
+++ b/internal/engine/postgresql/contrib/fuzzystrmatch.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsFuzzystrmatch = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/hstore.go b/internal/engine/postgresql/contrib/hstore.go
index 791cfb8e7..77403f191 100644
--- a/internal/engine/postgresql/contrib/hstore.go
+++ b/internal/engine/postgresql/contrib/hstore.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsHstore = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/intagg.go b/internal/engine/postgresql/contrib/intagg.go
index 8007b7fc4..a1c1b83c3 100644
--- a/internal/engine/postgresql/contrib/intagg.go
+++ b/internal/engine/postgresql/contrib/intagg.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsIntagg = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/intarray.go b/internal/engine/postgresql/contrib/intarray.go
index 42701846f..24005a8bc 100644
--- a/internal/engine/postgresql/contrib/intarray.go
+++ b/internal/engine/postgresql/contrib/intarray.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsIntarray = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/isn.go b/internal/engine/postgresql/contrib/isn.go
index a007046f0..98220a434 100644
--- a/internal/engine/postgresql/contrib/isn.go
+++ b/internal/engine/postgresql/contrib/isn.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsIsn = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/lo.go b/internal/engine/postgresql/contrib/lo.go
index b2b71e734..1e6869c1d 100644
--- a/internal/engine/postgresql/contrib/lo.go
+++ b/internal/engine/postgresql/contrib/lo.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsLo = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/ltree.go b/internal/engine/postgresql/contrib/ltree.go
index ccb40cad4..d149aee05 100644
--- a/internal/engine/postgresql/contrib/ltree.go
+++ b/internal/engine/postgresql/contrib/ltree.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsLtree = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pageinspect.go b/internal/engine/postgresql/contrib/pageinspect.go
index 9f989a94b..5a733eec2 100644
--- a/internal/engine/postgresql/contrib/pageinspect.go
+++ b/internal/engine/postgresql/contrib/pageinspect.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPageinspect = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_buffercache.go b/internal/engine/postgresql/contrib/pg_buffercache.go
index 756f9e99f..8f1054512 100644
--- a/internal/engine/postgresql/contrib/pg_buffercache.go
+++ b/internal/engine/postgresql/contrib/pg_buffercache.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgBuffercache = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_freespacemap.go b/internal/engine/postgresql/contrib/pg_freespacemap.go
index 856a660fa..02aed8630 100644
--- a/internal/engine/postgresql/contrib/pg_freespacemap.go
+++ b/internal/engine/postgresql/contrib/pg_freespacemap.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgFreespacemap = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_prewarm.go b/internal/engine/postgresql/contrib/pg_prewarm.go
index 821345f43..4fbd8910a 100644
--- a/internal/engine/postgresql/contrib/pg_prewarm.go
+++ b/internal/engine/postgresql/contrib/pg_prewarm.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgPrewarm = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_stat_statements.go b/internal/engine/postgresql/contrib/pg_stat_statements.go
index b525fc484..a0c5fc73d 100644
--- a/internal/engine/postgresql/contrib/pg_stat_statements.go
+++ b/internal/engine/postgresql/contrib/pg_stat_statements.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgStatStatements = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_trgm.go b/internal/engine/postgresql/contrib/pg_trgm.go
index 8cd9c5622..92639009e 100644
--- a/internal/engine/postgresql/contrib/pg_trgm.go
+++ b/internal/engine/postgresql/contrib/pg_trgm.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgTrgm = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pg_visibility.go b/internal/engine/postgresql/contrib/pg_visibility.go
index 0170e01de..f546ad0f1 100644
--- a/internal/engine/postgresql/contrib/pg_visibility.go
+++ b/internal/engine/postgresql/contrib/pg_visibility.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgVisibility = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pgcrypto.go b/internal/engine/postgresql/contrib/pgcrypto.go
index 5a0f330f0..ef1fc073b 100644
--- a/internal/engine/postgresql/contrib/pgcrypto.go
+++ b/internal/engine/postgresql/contrib/pgcrypto.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgcrypto = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pgrowlocks.go b/internal/engine/postgresql/contrib/pgrowlocks.go
index 2c9825c86..1bd8af016 100644
--- a/internal/engine/postgresql/contrib/pgrowlocks.go
+++ b/internal/engine/postgresql/contrib/pgrowlocks.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgrowlocks = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/pgstattuple.go b/internal/engine/postgresql/contrib/pgstattuple.go
index 39da0c2a1..4ac5b1834 100644
--- a/internal/engine/postgresql/contrib/pgstattuple.go
+++ b/internal/engine/postgresql/contrib/pgstattuple.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPgstattuple = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/postgres_fdw.go b/internal/engine/postgresql/contrib/postgres_fdw.go
index 142daf4e8..cf8d9746f 100644
--- a/internal/engine/postgresql/contrib/postgres_fdw.go
+++ b/internal/engine/postgresql/contrib/postgres_fdw.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsPostgresFdw = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/seg.go b/internal/engine/postgresql/contrib/seg.go
index 23f8f7ec7..20de65a1e 100644
--- a/internal/engine/postgresql/contrib/seg.go
+++ b/internal/engine/postgresql/contrib/seg.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsSeg = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/sslinfo.go b/internal/engine/postgresql/contrib/sslinfo.go
index cb407d667..b7327d0a3 100644
--- a/internal/engine/postgresql/contrib/sslinfo.go
+++ b/internal/engine/postgresql/contrib/sslinfo.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsSslinfo = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/tablefunc.go b/internal/engine/postgresql/contrib/tablefunc.go
index dafa2f3f7..611a36ed1 100644
--- a/internal/engine/postgresql/contrib/tablefunc.go
+++ b/internal/engine/postgresql/contrib/tablefunc.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsTablefunc = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/tcn.go b/internal/engine/postgresql/contrib/tcn.go
index 913a7d403..6a227216a 100644
--- a/internal/engine/postgresql/contrib/tcn.go
+++ b/internal/engine/postgresql/contrib/tcn.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsTcn = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/unaccent.go b/internal/engine/postgresql/contrib/unaccent.go
index 3f6577867..07e2e1ae9 100644
--- a/internal/engine/postgresql/contrib/unaccent.go
+++ b/internal/engine/postgresql/contrib/unaccent.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsUnaccent = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/uuid_ossp.go b/internal/engine/postgresql/contrib/uuid_ossp.go
index 4064c4d5f..1703e323a 100644
--- a/internal/engine/postgresql/contrib/uuid_ossp.go
+++ b/internal/engine/postgresql/contrib/uuid_ossp.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsUuidOssp = []*catalog.Function{
diff --git a/internal/engine/postgresql/contrib/xml2.go b/internal/engine/postgresql/contrib/xml2.go
index c30874e71..6fac3f04b 100644
--- a/internal/engine/postgresql/contrib/xml2.go
+++ b/internal/engine/postgresql/contrib/xml2.go
@@ -3,8 +3,8 @@
 package contrib
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsXml2 = []*catalog.Function{
diff --git a/internal/engine/postgresql/convert.go b/internal/engine/postgresql/convert.go
index 60dac94a4..38a5e62a2 100644
--- a/internal/engine/postgresql/convert.go
+++ b/internal/engine/postgresql/convert.go
@@ -8,7 +8,7 @@ import (
 
 	pg "github.com/pganalyze/pg_query_go/v4"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func convertFuncParamMode(m pg.FunctionParameterMode) (ast.FuncParamMode, error) {
diff --git a/internal/engine/postgresql/extension.go b/internal/engine/postgresql/extension.go
index d33f81532..c2bfed5c5 100644
--- a/internal/engine/postgresql/extension.go
+++ b/internal/engine/postgresql/extension.go
@@ -3,8 +3,8 @@
 package postgresql
 
 import (
-	"github.com/kyleconroy/sqlc/internal/engine/postgresql/contrib"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/engine/postgresql/contrib"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func loadExtension(name string) *catalog.Schema {
diff --git a/internal/engine/postgresql/information_schema.go b/internal/engine/postgresql/information_schema.go
index 07f841296..ac76d4790 100644
--- a/internal/engine/postgresql/information_schema.go
+++ b/internal/engine/postgresql/information_schema.go
@@ -3,8 +3,8 @@
 package postgresql
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsgenInformationSchema = []*catalog.Function{}
diff --git a/internal/engine/postgresql/parse.go b/internal/engine/postgresql/parse.go
index fa1a54a91..de100be0c 100644
--- a/internal/engine/postgresql/parse.go
+++ b/internal/engine/postgresql/parse.go
@@ -12,9 +12,9 @@ import (
 	nodes "github.com/pganalyze/pg_query_go/v4"
 	"github.com/pganalyze/pg_query_go/v4/parser"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func stringSlice(list *nodes.List) []string {
diff --git a/internal/engine/postgresql/parse_disabled.go b/internal/engine/postgresql/parse_disabled.go
index 882330f3e..ecc5158d4 100644
--- a/internal/engine/postgresql/parse_disabled.go
+++ b/internal/engine/postgresql/parse_disabled.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"runtime"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func NewParser() *Parser {
diff --git a/internal/engine/postgresql/pg_catalog.go b/internal/engine/postgresql/pg_catalog.go
index 1b1fe231b..9000b592f 100644
--- a/internal/engine/postgresql/pg_catalog.go
+++ b/internal/engine/postgresql/pg_catalog.go
@@ -3,8 +3,8 @@
 package postgresql
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 var funcsgenPGCatalog = []*catalog.Function{
diff --git a/internal/engine/postgresql/pg_temp.go b/internal/engine/postgresql/pg_temp.go
index 21849928c..bedf10591 100644
--- a/internal/engine/postgresql/pg_temp.go
+++ b/internal/engine/postgresql/pg_temp.go
@@ -1,7 +1,7 @@
 package postgresql
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 func pgTemp() *catalog.Schema {
diff --git a/internal/engine/sqlite/catalog.go b/internal/engine/sqlite/catalog.go
index cdfb29e51..d7d27489a 100644
--- a/internal/engine/sqlite/catalog.go
+++ b/internal/engine/sqlite/catalog.go
@@ -1,6 +1,6 @@
 package sqlite
 
-import "github.com/kyleconroy/sqlc/internal/sql/catalog"
+import "github.com/sqlc-dev/sqlc/internal/sql/catalog"
 
 func NewCatalog() *catalog.Catalog {
 	def := "main"
diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go
index 64ff672d6..e5485648a 100644
--- a/internal/engine/sqlite/convert.go
+++ b/internal/engine/sqlite/convert.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/antlr/antlr4/runtime/Go/antlr/v4"
 
-	"github.com/kyleconroy/sqlc/internal/debug"
-	"github.com/kyleconroy/sqlc/internal/engine/sqlite/parser"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/engine/sqlite/parser"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type cc struct {
diff --git a/internal/engine/sqlite/parse.go b/internal/engine/sqlite/parse.go
index a40502d96..bf0bacad9 100644
--- a/internal/engine/sqlite/parse.go
+++ b/internal/engine/sqlite/parse.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/antlr/antlr4/runtime/Go/antlr/v4"
 
-	"github.com/kyleconroy/sqlc/internal/engine/sqlite/parser"
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/engine/sqlite/parser"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type errorListener struct {
diff --git a/internal/engine/sqlite/stdlib.go b/internal/engine/sqlite/stdlib.go
index 9c30eb9b1..89b7af2e9 100644
--- a/internal/engine/sqlite/stdlib.go
+++ b/internal/engine/sqlite/stdlib.go
@@ -1,8 +1,8 @@
 package sqlite
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 // sqlite functions from:
diff --git a/internal/engine/sqlite/utils.go b/internal/engine/sqlite/utils.go
index 74050651f..f3b5ee289 100644
--- a/internal/engine/sqlite/utils.go
+++ b/internal/engine/sqlite/utils.go
@@ -1,8 +1,8 @@
 package sqlite
 
 import (
-	"github.com/kyleconroy/sqlc/internal/engine/sqlite/parser"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/engine/sqlite/parser"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type tableNamer interface {
diff --git a/internal/ext/handler.go b/internal/ext/handler.go
index 0f586039c..adeacff69 100644
--- a/internal/ext/handler.go
+++ b/internal/ext/handler.go
@@ -3,7 +3,7 @@ package ext
 import (
 	"context"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type Handler interface {
diff --git a/internal/ext/process/gen.go b/internal/ext/process/gen.go
index 0c0295ad8..dc39a15fd 100644
--- a/internal/ext/process/gen.go
+++ b/internal/ext/process/gen.go
@@ -9,7 +9,7 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type Runner struct {
diff --git a/internal/ext/wasm/nowasm.go b/internal/ext/wasm/nowasm.go
index cd2a75ae8..ab273e6ae 100644
--- a/internal/ext/wasm/nowasm.go
+++ b/internal/ext/wasm/nowasm.go
@@ -4,9 +4,9 @@ package wasm
 
 import (
 	"fmt"
-    "context"
+	"context"
 
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 type Runner struct {
diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go
index ee4b1841d..52295d7e6 100644
--- a/internal/ext/wasm/wasm.go
+++ b/internal/ext/wasm/wasm.go
@@ -21,8 +21,8 @@ import (
 	wasmtime "github.com/bytecodealliance/wasmtime-go/v8"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/kyleconroy/sqlc/internal/info"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/info"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 // This version must be updated whenever the wasmtime-go dependency is updated
diff --git a/internal/multierr/error.go b/internal/multierr/error.go
index 5dc10736d..433a24bf8 100644
--- a/internal/multierr/error.go
+++ b/internal/multierr/error.go
@@ -3,8 +3,8 @@ package multierr
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/source"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/source"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 type FileError struct {
diff --git a/internal/remote/rpc.go b/internal/remote/rpc.go
index fdde77de9..d7b855645 100644
--- a/internal/remote/rpc.go
+++ b/internal/remote/rpc.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/config"
 )
 
 const defaultHostname = "remote.sqlc.dev"
diff --git a/internal/sql/astutils/join.go b/internal/sql/astutils/join.go
index 7d2f7829b..adca4c20a 100644
--- a/internal/sql/astutils/join.go
+++ b/internal/sql/astutils/join.go
@@ -3,7 +3,7 @@ package astutils
 import (
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func Join(list *ast.List, sep string) string {
diff --git a/internal/sql/astutils/rewrite.go b/internal/sql/astutils/rewrite.go
index 3dc2a5829..93c5be3cf 100644
--- a/internal/sql/astutils/rewrite.go
+++ b/internal/sql/astutils/rewrite.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 // An ApplyFunc is invoked by Apply for each node n, even if n is nil,
diff --git a/internal/sql/astutils/search.go b/internal/sql/astutils/search.go
index 5aeacfb9d..d61ee1345 100644
--- a/internal/sql/astutils/search.go
+++ b/internal/sql/astutils/search.go
@@ -1,6 +1,6 @@
 package astutils
 
-import "github.com/kyleconroy/sqlc/internal/sql/ast"
+import "github.com/sqlc-dev/sqlc/internal/sql/ast"
 
 type nodeSearch struct {
 	list  *ast.List
diff --git a/internal/sql/astutils/walk.go b/internal/sql/astutils/walk.go
index 4bae5629e..9f26617ad 100644
--- a/internal/sql/astutils/walk.go
+++ b/internal/sql/astutils/walk.go
@@ -3,7 +3,7 @@ package astutils
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 type Visitor interface {
diff --git a/internal/sql/catalog/catalog.go b/internal/sql/catalog/catalog.go
index 7417f60a8..278ea8797 100644
--- a/internal/sql/catalog/catalog.go
+++ b/internal/sql/catalog/catalog.go
@@ -1,7 +1,7 @@
 package catalog
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 // Catalog describes a database instance consisting of metadata in which database objects are defined
diff --git a/internal/sql/catalog/comment_on.go b/internal/sql/catalog/comment_on.go
index 7251398f8..49c714491 100644
--- a/internal/sql/catalog/comment_on.go
+++ b/internal/sql/catalog/comment_on.go
@@ -1,8 +1,8 @@
 package catalog
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func (c *Catalog) commentOnColumn(stmt *ast.CommentOnColumnStmt) error {
diff --git a/internal/sql/catalog/extension.go b/internal/sql/catalog/extension.go
index b569f5b8a..fdb717f2d 100644
--- a/internal/sql/catalog/extension.go
+++ b/internal/sql/catalog/extension.go
@@ -1,7 +1,7 @@
 package catalog
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func (c *Catalog) createExtension(stmt *ast.CreateExtensionStmt) error {
diff --git a/internal/sql/catalog/func.go b/internal/sql/catalog/func.go
index 80acd1da5..7cc712492 100644
--- a/internal/sql/catalog/func.go
+++ b/internal/sql/catalog/func.go
@@ -3,8 +3,8 @@ package catalog
 import (
 	"errors"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 // Function describes a database function
diff --git a/internal/sql/catalog/public.go b/internal/sql/catalog/public.go
index 19ccd8400..19fd50722 100644
--- a/internal/sql/catalog/public.go
+++ b/internal/sql/catalog/public.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func (c *Catalog) schemasToSearch(ns string) []string {
diff --git a/internal/sql/catalog/schema.go b/internal/sql/catalog/schema.go
index ad9ffb0a0..72a32a6ff 100644
--- a/internal/sql/catalog/schema.go
+++ b/internal/sql/catalog/schema.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 // Schema describes how the data in a relational database may relate to other tables or other data models
diff --git a/internal/sql/catalog/table.go b/internal/sql/catalog/table.go
index f4dbb7837..93486bdc9 100644
--- a/internal/sql/catalog/table.go
+++ b/internal/sql/catalog/table.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 // Table describes a relational database table
diff --git a/internal/sql/catalog/types.go b/internal/sql/catalog/types.go
index 186b8d1f0..e92a3a219 100644
--- a/internal/sql/catalog/types.go
+++ b/internal/sql/catalog/types.go
@@ -3,8 +3,8 @@ package catalog
 import (
 	"errors"
 	"fmt"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 type Type interface {
diff --git a/internal/sql/catalog/view.go b/internal/sql/catalog/view.go
index d11989409..d5222c4d0 100644
--- a/internal/sql/catalog/view.go
+++ b/internal/sql/catalog/view.go
@@ -1,8 +1,8 @@
 package catalog
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func (c *Catalog) createView(stmt *ast.ViewStmt, colGen columnGenerator) error {
diff --git a/internal/sql/info/info.go b/internal/sql/info/info.go
index 0bebaf251..48484ef38 100644
--- a/internal/sql/info/info.go
+++ b/internal/sql/info/info.go
@@ -1,7 +1,7 @@
 package info
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 )
 
 // Provide a read-only view into the catalog
diff --git a/internal/sql/named/is.go b/internal/sql/named/is.go
index 90f0a6eff..d53c1d990 100644
--- a/internal/sql/named/is.go
+++ b/internal/sql/named/is.go
@@ -1,8 +1,8 @@
 package named
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 // IsParamFunc fulfills the astutils.Search
diff --git a/internal/sql/rewrite/embeds.go b/internal/sql/rewrite/embeds.go
index 1b132ec92..596c03be8 100644
--- a/internal/sql/rewrite/embeds.go
+++ b/internal/sql/rewrite/embeds.go
@@ -3,8 +3,8 @@ package rewrite
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 )
 
 // Embed is an instance of `sqlc.embed(param)`
diff --git a/internal/sql/rewrite/parameters.go b/internal/sql/rewrite/parameters.go
index f8e0c456d..d1ea1a22c 100644
--- a/internal/sql/rewrite/parameters.go
+++ b/internal/sql/rewrite/parameters.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/source"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/named"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/source"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/named"
 )
 
 // Given an AST node, return the string representation of names
diff --git a/internal/sql/sqlpath/read.go b/internal/sql/sqlpath/read.go
index 12cd2ee80..24072001c 100644
--- a/internal/sql/sqlpath/read.go
+++ b/internal/sql/sqlpath/read.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kyleconroy/sqlc/internal/migrations"
+	"github.com/sqlc-dev/sqlc/internal/migrations"
 )
 
 // Return a list of SQL files in the listed paths. Only includes files ending
diff --git a/internal/sql/validate/cmd.go b/internal/sql/validate/cmd.go
index 0dcc17638..079c10c3f 100644
--- a/internal/sql/validate/cmd.go
+++ b/internal/sql/validate/cmd.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
 func validateCopyfrom(n ast.Node) error {
diff --git a/internal/sql/validate/func_call.go b/internal/sql/validate/func_call.go
index bbda232c6..383366c68 100644
--- a/internal/sql/validate/func_call.go
+++ b/internal/sql/validate/func_call.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/config"
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/config"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 type funcCallVisitor struct {
diff --git a/internal/sql/validate/in.go b/internal/sql/validate/in.go
index a23a8fbe3..56bcee125 100644
--- a/internal/sql/validate/in.go
+++ b/internal/sql/validate/in.go
@@ -3,10 +3,10 @@ package validate
 import (
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 type inVisitor struct {
diff --git a/internal/sql/validate/insert_stmt.go b/internal/sql/validate/insert_stmt.go
index e86de4f46..dd8041ea2 100644
--- a/internal/sql/validate/insert_stmt.go
+++ b/internal/sql/validate/insert_stmt.go
@@ -1,8 +1,8 @@
 package validate
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func InsertStmt(stmt *ast.InsertStmt) error {
diff --git a/internal/sql/validate/param_ref.go b/internal/sql/validate/param_ref.go
index b94a98386..1ee04bb5e 100644
--- a/internal/sql/validate/param_ref.go
+++ b/internal/sql/validate/param_ref.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 func ParamRef(n ast.Node) (map[int]bool, bool, error) {
diff --git a/internal/sql/validate/param_style.go b/internal/sql/validate/param_style.go
index 48008122e..64f8bd9c8 100644
--- a/internal/sql/validate/param_style.go
+++ b/internal/sql/validate/param_style.go
@@ -1,10 +1,10 @@
 package validate
 
 import (
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
-	"github.com/kyleconroy/sqlc/internal/sql/named"
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/named"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
 // A query can use one (and only one) of the following formats:
diff --git a/internal/tracer/trace.go b/internal/tracer/trace.go
index d0c265f1c..8252f49b3 100644
--- a/internal/tracer/trace.go
+++ b/internal/tracer/trace.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"runtime/trace"
 
-	"github.com/kyleconroy/sqlc/internal/debug"
+	"github.com/sqlc-dev/sqlc/internal/debug"
 )
 
 // Start starts Go's runtime tracing facility.
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index 695c0c4bc..35457e06e 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -3,24 +3,23 @@
 //
 // Example usage:
 //
-//     package main
+//	package main
 //
-//     import (
-//         "os"
+//	import (
+//	    "os"
 //
-//         sqlc "github.com/kyleconroy/sqlc/pkg/cli"
-//     )
-//
-//     func main() {
-//         os.Exit(sqlc.Run(os.Args[1:]))
-//     }
+//	    sqlc "github.com/kyleconroy/sqlc/pkg/cli"
+//	)
 //
+//	func main() {
+//	    os.Exit(sqlc.Run(os.Args[1:]))
+//	}
 package cli
 
 import (
 	"os"
 
-	"github.com/kyleconroy/sqlc/internal/cmd"
+	"github.com/sqlc-dev/sqlc/internal/cmd"
 )
 
 // Run the sqlc CLI. It takes an array of command-line arguments


Test patch:
diff --git a/examples/authors/mysql/db_test.go b/examples/authors/mysql/db_test.go
index e7c90090f..26f3035b3 100644
--- a/examples/authors/mysql/db_test.go
+++ b/examples/authors/mysql/db_test.go
@@ -8,7 +8,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestAuthors(t *testing.T) {
diff --git a/examples/authors/postgresql/db_test.go b/examples/authors/postgresql/db_test.go
index 181dc6602..150c11861 100644
--- a/examples/authors/postgresql/db_test.go
+++ b/examples/authors/postgresql/db_test.go
@@ -8,7 +8,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestAuthors(t *testing.T) {
diff --git a/examples/authors/sqlite/db_test.go b/examples/authors/sqlite/db_test.go
index db5326b79..b07804b62 100644
--- a/examples/authors/sqlite/db_test.go
+++ b/examples/authors/sqlite/db_test.go
@@ -8,7 +8,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestAuthors(t *testing.T) {
diff --git a/examples/batch/postgresql/db_test.go b/examples/batch/postgresql/db_test.go
index 4455cfdf3..9395e4c20 100644
--- a/examples/batch/postgresql/db_test.go
+++ b/examples/batch/postgresql/db_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestBatchBooks(t *testing.T) {
diff --git a/examples/booktest/mysql/db_test.go b/examples/booktest/mysql/db_test.go
index 6b9b841bf..810b9d68c 100644
--- a/examples/booktest/mysql/db_test.go
+++ b/examples/booktest/mysql/db_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestBooks(t *testing.T) {
diff --git a/examples/booktest/postgresql/db_test.go b/examples/booktest/postgresql/db_test.go
index 6d211b4e6..440198d0e 100644
--- a/examples/booktest/postgresql/db_test.go
+++ b/examples/booktest/postgresql/db_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func TestBooks(t *testing.T) {
diff --git a/examples/booktest/sqlite/db_test.go b/examples/booktest/sqlite/db_test.go
index 45ed30527..d1da918ba 100644
--- a/examples/booktest/sqlite/db_test.go
+++ b/examples/booktest/sqlite/db_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 // TODO: Enum is not yet supported
diff --git a/examples/ondeck/mysql/db_test.go b/examples/ondeck/mysql/db_test.go
index a3c8d7110..b4b343f9d 100644
--- a/examples/ondeck/mysql/db_test.go
+++ b/examples/ondeck/mysql/db_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/examples/ondeck/postgresql/db_test.go b/examples/ondeck/postgresql/db_test.go
index 63270daf3..fd16a4948 100644
--- a/examples/ondeck/postgresql/db_test.go
+++ b/examples/ondeck/postgresql/db_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/examples/ondeck/sqlite/db_test.go b/examples/ondeck/sqlite/db_test.go
index 4c73d1378..f106256d4 100644
--- a/examples/ondeck/sqlite/db_test.go
+++ b/examples/ondeck/sqlite/db_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/internal/codegen/golang/result_test.go b/internal/codegen/golang/result_test.go
index b3b1fbb59..4156b848e 100644
--- a/internal/codegen/golang/result_test.go
+++ b/internal/codegen/golang/result_test.go
@@ -3,8 +3,8 @@ package golang
 import (
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/metadata"
-	"github.com/kyleconroy/sqlc/internal/plugin"
+	"github.com/sqlc-dev/sqlc/internal/metadata"
+	"github.com/sqlc-dev/sqlc/internal/plugin"
 )
 
 func TestPutOutColumns_ForZeroColumns(t *testing.T) {
diff --git a/internal/endtoend/endtoend_test.go b/internal/endtoend/endtoend_test.go
index 389319372..5df39c44e 100644
--- a/internal/endtoend/endtoend_test.go
+++ b/internal/endtoend/endtoend_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 
-	"github.com/kyleconroy/sqlc/internal/cmd"
-	"github.com/kyleconroy/sqlc/internal/opts"
+	"github.com/sqlc-dev/sqlc/internal/cmd"
+	"github.com/sqlc-dev/sqlc/internal/opts"
 )
 
 func TestExamples(t *testing.T) {
diff --git a/internal/endtoend/testdata/go.mod b/internal/endtoend/testdata/go.mod
index 4ee5a8260..5ef0712d8 100644
--- a/internal/endtoend/testdata/go.mod
+++ b/internal/endtoend/testdata/go.mod
@@ -9,9 +9,9 @@ require (
 	github.com/jackc/pgtype v1.6.2
 	github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904
 	github.com/jackc/pgx/v5 v5.0.1
-	github.com/kyleconroy/sqlc-testdata v0.0.0-20200512000015-15313bc43553
 	github.com/lib/pq v1.9.0
 	github.com/sqlc-dev/pqtype v0.2.0
+	github.com/sqlc-dev/sqlc-testdata v1.0.0
 	github.com/volatiletech/null/v8 v8.1.2
 	gopkg.in/guregu/null.v4 v4.0.0
 )
diff --git a/internal/endtoend/testdata/go.sum b/internal/endtoend/testdata/go.sum
index 2290e9aff..83307fa12 100644
--- a/internal/endtoend/testdata/go.sum
+++ b/internal/endtoend/testdata/go.sum
@@ -71,8 +71,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kyleconroy/sqlc-testdata v0.0.0-20200512000015-15313bc43553 h1:IlnX6Ga5wEbn5Ejey9S6GTSzoAJuCnmxYjYZa6nUbsE=
-github.com/kyleconroy/sqlc-testdata v0.0.0-20200512000015-15313bc43553/go.mod h1:F2aHHOnBI1Big/J6ffYQnyyUXxcZ1vI9IXPaA0noK8c=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -103,6 +101,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sqlc-dev/pqtype v0.2.0 h1:zfzDpAxjCU0/GO7EgZ7ELUh0w28SrMSHzO3rH5Wd3is=
 github.com/sqlc-dev/pqtype v0.2.0/go.mod h1:oyUjp5981ctiL9UYvj1bVvCKi8OXkCa0u645hce7CAs=
+github.com/sqlc-dev/sqlc-testdata v1.0.0 h1:NrfFkZ3xh2XHqDNqYE6Q87hhXd1n6GQr3XE0V+CveSQ=
+github.com/sqlc-dev/sqlc-testdata v1.0.0/go.mod h1:Ima4gy0tylq+cNW1VSV36/NoAHMbZZKjHNs7SfM9Pns=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
diff --git a/internal/endtoend/testdata/overrides/mysql/go/models.go b/internal/endtoend/testdata/overrides/mysql/go/models.go
index 05360e272..6e61550f9 100644
--- a/internal/endtoend/testdata/overrides/mysql/go/models.go
+++ b/internal/endtoend/testdata/overrides/mysql/go/models.go
@@ -5,7 +5,7 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/overrides/mysql/sqlc.json b/internal/endtoend/testdata/overrides/mysql/sqlc.json
index 592fb072a..5e0c8b6dc 100644
--- a/internal/endtoend/testdata/overrides/mysql/sqlc.json
+++ b/internal/endtoend/testdata/overrides/mysql/sqlc.json
@@ -9,7 +9,7 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         }
       ]
diff --git a/internal/endtoend/testdata/overrides/postgresql/pgx/v4/go/models.go b/internal/endtoend/testdata/overrides/postgresql/pgx/v4/go/models.go
index 802a07d7e..91b5e64ee 100644
--- a/internal/endtoend/testdata/overrides/postgresql/pgx/v4/go/models.go
+++ b/internal/endtoend/testdata/overrides/postgresql/pgx/v4/go/models.go
@@ -5,8 +5,8 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
 	"github.com/lib/pq"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/overrides/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/overrides/postgresql/pgx/v4/sqlc.json
index 66ea54ce7..db76a9de4 100644
--- a/internal/endtoend/testdata/overrides/postgresql/pgx/v4/sqlc.json
+++ b/internal/endtoend/testdata/overrides/postgresql/pgx/v4/sqlc.json
@@ -10,7 +10,7 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         },
         {
diff --git a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go
index 802a07d7e..91b5e64ee 100644
--- a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go
+++ b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go
@@ -5,8 +5,8 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
 	"github.com/lib/pq"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/sqlc.json
index c75c135f1..109d41a65 100644
--- a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/sqlc.json
+++ b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/sqlc.json
@@ -10,7 +10,7 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         },
         {
diff --git a/internal/endtoend/testdata/overrides/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/overrides/postgresql/stdlib/go/models.go
index 802a07d7e..91b5e64ee 100644
--- a/internal/endtoend/testdata/overrides/postgresql/stdlib/go/models.go
+++ b/internal/endtoend/testdata/overrides/postgresql/stdlib/go/models.go
@@ -5,8 +5,8 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
 	"github.com/lib/pq"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/overrides/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/overrides/postgresql/stdlib/sqlc.json
index d5793575b..28e58c947 100644
--- a/internal/endtoend/testdata/overrides/postgresql/stdlib/sqlc.json
+++ b/internal/endtoend/testdata/overrides/postgresql/stdlib/sqlc.json
@@ -9,7 +9,7 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         },
         {
diff --git a/internal/endtoend/testdata/overrides/sqlite/go/models.go b/internal/endtoend/testdata/overrides/sqlite/go/models.go
index 05360e272..6e61550f9 100644
--- a/internal/endtoend/testdata/overrides/sqlite/go/models.go
+++ b/internal/endtoend/testdata/overrides/sqlite/go/models.go
@@ -5,7 +5,7 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/overrides/sqlite/sqlc.json b/internal/endtoend/testdata/overrides/sqlite/sqlc.json
index ce7ab410c..3b2209765 100644
--- a/internal/endtoend/testdata/overrides/sqlite/sqlc.json
+++ b/internal/endtoend/testdata/overrides/sqlite/sqlc.json
@@ -9,7 +9,7 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         }
       ]
diff --git a/internal/endtoend/testdata/overrides_go_types/mysql/go/models.go b/internal/endtoend/testdata/overrides_go_types/mysql/go/models.go
index 31c1d6f67..8d269e250 100644
--- a/internal/endtoend/testdata/overrides_go_types/mysql/go/models.go
+++ b/internal/endtoend/testdata/overrides_go_types/mysql/go/models.go
@@ -5,7 +5,7 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Bar struct {
diff --git a/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go b/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
index 532d14c9d..8cbf4ec86 100644
--- a/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/overrides_go_types/mysql/go/query.sql.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/kyleconroy/sqlc-testdata/pkg"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 const testIN = `-- name: TestIN :many
diff --git a/internal/endtoend/testdata/overrides_go_types/mysql/sqlc.json b/internal/endtoend/testdata/overrides_go_types/mysql/sqlc.json
index 787bf1459..75730b275 100644
--- a/internal/endtoend/testdata/overrides_go_types/mysql/sqlc.json
+++ b/internal/endtoend/testdata/overrides_go_types/mysql/sqlc.json
@@ -9,11 +9,11 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         },
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "*.also_retyped"
         }
       ]
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go b/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
index 31c1d6f67..8d269e250 100644
--- a/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
+++ b/internal/endtoend/testdata/overrides_go_types/sqlite/go/models.go
@@ -5,7 +5,7 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Bar struct {
diff --git a/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json b/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json
index 9d4799f4f..212161c01 100644
--- a/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json
+++ b/internal/endtoend/testdata/overrides_go_types/sqlite/sqlc.json
@@ -9,11 +9,11 @@
       "queries": "query.sql",
       "overrides": [
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "foo.retyped"
         },
         {
-          "go_type": "github.com/kyleconroy/sqlc-testdata/pkg.CustomType",
+          "go_type": "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType",
           "column": "*.also_retyped"
         }
       ]
diff --git a/internal/endtoend/testdata/sqlc_slice/mysql/go/models.go b/internal/endtoend/testdata/sqlc_slice/mysql/go/models.go
index 0c4f496e0..036a57981 100644
--- a/internal/endtoend/testdata/sqlc_slice/mysql/go/models.go
+++ b/internal/endtoend/testdata/sqlc_slice/mysql/go/models.go
@@ -7,7 +7,7 @@ package querytest
 import (
 	"database/sql"
 
-	"github.com/kyleconroy/sqlc-testdata/mysql"
+	"github.com/sqlc-dev/sqlc-testdata/mysql"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
index 2849e0a52..b430cc975 100644
--- a/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
+++ b/internal/endtoend/testdata/sqlc_slice/mysql/go/query.sql.go
@@ -10,7 +10,7 @@ import (
 	"database/sql"
 	"strings"
 
-	"github.com/kyleconroy/sqlc-testdata/mysql"
+	"github.com/sqlc-dev/sqlc-testdata/mysql"
 )
 
 const funcNullable = `-- name: FuncNullable :many
diff --git a/internal/endtoend/testdata/sqlc_slice/mysql/sqlc.json b/internal/endtoend/testdata/sqlc_slice/mysql/sqlc.json
index e37bdfff0..56d891c6e 100644
--- a/internal/endtoend/testdata/sqlc_slice/mysql/sqlc.json
+++ b/internal/endtoend/testdata/sqlc_slice/mysql/sqlc.json
@@ -12,7 +12,7 @@
   "overrides": [
     {
     "column": "foo.mystr",
-    "go_type": "github.com/kyleconroy/sqlc-testdata/mysql.ID"
+    "go_type": "github.com/sqlc-dev/sqlc-testdata/mysql.ID"
     }
   ]
 }
diff --git a/internal/endtoend/testdata/yaml_overrides/go/models.go b/internal/endtoend/testdata/yaml_overrides/go/models.go
index 802a07d7e..91b5e64ee 100644
--- a/internal/endtoend/testdata/yaml_overrides/go/models.go
+++ b/internal/endtoend/testdata/yaml_overrides/go/models.go
@@ -5,8 +5,8 @@
 package override
 
 import (
-	"github.com/kyleconroy/sqlc-testdata/pkg"
 	"github.com/lib/pq"
+	"github.com/sqlc-dev/sqlc-testdata/pkg"
 )
 
 type Foo struct {
diff --git a/internal/endtoend/testdata/yaml_overrides/sqlc.yaml b/internal/endtoend/testdata/yaml_overrides/sqlc.yaml
index 9763b01fc..3bc1c1f39 100644
--- a/internal/endtoend/testdata/yaml_overrides/sqlc.yaml
+++ b/internal/endtoend/testdata/yaml_overrides/sqlc.yaml
@@ -5,7 +5,7 @@ packages:
     schema: "sql/"
     queries: "sql/"
     overrides:
-      - go_type: "github.com/kyleconroy/sqlc-testdata/pkg.CustomType"
+      - go_type: "github.com/sqlc-dev/sqlc-testdata/pkg.CustomType"
         column: "foo.retyped"
       - go_type: "github.com/lib/pq.StringArray"
         column: "foo.langs"
diff --git a/internal/endtoend/vet_test.go b/internal/endtoend/vet_test.go
index 6989d0f9e..d453189e2 100644
--- a/internal/endtoend/vet_test.go
+++ b/internal/endtoend/vet_test.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/cmd"
-	"github.com/kyleconroy/sqlc/internal/sqltest"
+	"github.com/sqlc-dev/sqlc/internal/cmd"
+	"github.com/sqlc-dev/sqlc/internal/sqltest"
 )
 
 func findSchema(t *testing.T, path string) (string, bool) {
diff --git a/internal/engine/postgresql/catalog_test.go b/internal/engine/postgresql/catalog_test.go
index 537cdb857..875ea7e45 100644
--- a/internal/engine/postgresql/catalog_test.go
+++ b/internal/engine/postgresql/catalog_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/internal/engine/postgresql/rewrite_test.go b/internal/engine/postgresql/rewrite_test.go
index 0aa20c565..4a2460cd2 100644
--- a/internal/engine/postgresql/rewrite_test.go
+++ b/internal/engine/postgresql/rewrite_test.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/astutils"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/astutils"
 
 	"github.com/google/go-cmp/cmp"
 )
diff --git a/internal/engine/sqlite/catalog_test.go b/internal/engine/sqlite/catalog_test.go
index a1880f7ee..3c3028fcc 100644
--- a/internal/engine/sqlite/catalog_test.go
+++ b/internal/engine/sqlite/catalog_test.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sql/ast"
-	"github.com/kyleconroy/sqlc/internal/sql/catalog"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
diff --git a/internal/sqltest/mysql.go b/internal/sqltest/mysql.go
index 2cbda0b0d..a1fbf4157 100644
--- a/internal/sqltest/mysql.go
+++ b/internal/sqltest/mysql.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 
 	_ "github.com/go-sql-driver/mysql"
 )
diff --git a/internal/sqltest/pgx.go b/internal/sqltest/pgx.go
index 13ecefe9e..73e01701b 100644
--- a/internal/sqltest/pgx.go
+++ b/internal/sqltest/pgx.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 
 	"github.com/jackc/pgx/v4"
 )
diff --git a/internal/sqltest/postgres.go b/internal/sqltest/postgres.go
index 7a250763c..edf6272d4 100644
--- a/internal/sqltest/postgres.go
+++ b/internal/sqltest/postgres.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 
 	_ "github.com/lib/pq"
 )
diff --git a/internal/sqltest/sqlite.go b/internal/sqltest/sqlite.go
index 7662d8ffa..cd7eff387 100644
--- a/internal/sqltest/sqlite.go
+++ b/internal/sqltest/sqlite.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
+	"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
 
 	_ "github.com/mattn/go-sqlite3"
 )