diff --git a/Makefile b/Makefile
index 9739114f11..3cd60dc97f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,6 @@ proto:
 
 remote-proto:
 	protoc \
-		--go_out=. --go_opt="Minternal/remote/gen.proto=github.com/kyleconroy/sqlc/internal/remote" --go_opt=module=github.com/kyleconroy/sqlc \
-        --go-grpc_out=. --go-grpc_opt="Minternal/remote/gen.proto=github.com/kyleconroy/sqlc/internal/remote" --go-grpc_opt=module=github.com/kyleconroy/sqlc \
+		--go_out=. --go_opt="Minternal/remote/gen.proto=github.com/sqlc-dev/sqlc/internal/remote" --go_opt=module=github.com/sqlc-dev/sqlc \
+        --go-grpc_out=. --go-grpc_opt="Minternal/remote/gen.proto=github.com/sqlc-dev/sqlc/internal/remote" --go-grpc_opt=module=github.com/sqlc-dev/sqlc \
         internal/remote/gen.proto
diff --git a/README.md b/README.md
index 09ed767a28..8eb75da8db 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # sqlc: A SQL Compiler
 
-![go](https://github.com/kyleconroy/sqlc/workflows/go/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/kyleconroy/sqlc)](https://goreportcard.com/report/github.com/kyleconroy/sqlc)
+![go](https://github.com/sqlc-dev/sqlc/workflows/go/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/sqlc-dev/sqlc)](https://goreportcard.com/report/github.com/sqlc-dev/sqlc)
 
 sqlc generates **type-safe code** from SQL. Here's how it works:
 
diff --git a/cliff.toml b/cliff.toml
index 88247a0626..9b20e5b4dd 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file.\n
 # https://tera.netlify.app/docs/#introduction
 body = """
 {% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}](https://github.com/kyleconroy/sqlc/releases/tag/{{ version }})
+    ## [{{ version | trim_start_matches(pat="v") }}](https://github.com/sqlc-dev/sqlc/releases/tag/{{ version }})
 {% else %}\
     ## [unreleased]
 {% endif %}\
diff --git a/docs/overview/install.md b/docs/overview/install.md
index c7dfe37e2b..8c975770e6 100644
--- a/docs/overview/install.md
+++ b/docs/overview/install.md
@@ -19,13 +19,13 @@ sudo snap install sqlc
 ### Go >= 1.17:
 
 ```
-go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
 ```
 
 ### Go < 1.17:
 
 ```
-go get github.com/kyleconroy/sqlc/cmd/sqlc
+go get github.com/sqlc-dev/sqlc/cmd/sqlc
 ```
 
 ## Docker
diff --git a/internal/config/override.go b/internal/config/override.go
index a2edb94cf2..f2337a79de 100644
--- a/internal/config/override.go
+++ b/internal/config/override.go
@@ -14,7 +14,7 @@ type Override struct {
 	GoType GoType `json:"go_type" yaml:"go_type"`
 
 	// additional Go struct tags to add to this field, in raw Go struct tag form, e.g. `validate:"required" x:"y,z"`
-	// see https://github.com/kyleconroy/sqlc/issues/534
+	// see https://github.com/sqlc-dev/sqlc/issues/534
 	GoStructTag GoStructTag `json:"go_struct_tag" yaml:"go_struct_tag"`
 
 	// fully qualified name of the Go type, e.g. `github.com/segmentio/ksuid.KSUID`
diff --git a/internal/endtoend/testdata/case_named_params/mysql/query.sql b/internal/endtoend/testdata/case_named_params/mysql/query.sql
index 5167ec8769..ef5deca36c 100644
--- a/internal/endtoend/testdata/case_named_params/mysql/query.sql
+++ b/internal/endtoend/testdata/case_named_params/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1195
+-- https://github.com/sqlc-dev/sqlc/issues/1195
 
 CREATE TABLE authors (
   id   BIGINT PRIMARY KEY,
diff --git a/internal/endtoend/testdata/case_named_params/postgresql/query.sql b/internal/endtoend/testdata/case_named_params/postgresql/query.sql
index ddd974424a..a4e653aee4 100644
--- a/internal/endtoend/testdata/case_named_params/postgresql/query.sql
+++ b/internal/endtoend/testdata/case_named_params/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1195
+-- https://github.com/sqlc-dev/sqlc/issues/1195
 
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
diff --git a/internal/endtoend/testdata/go.mod b/internal/endtoend/testdata/go.mod
index b109e3730b..535a3b8d29 100644
--- a/internal/endtoend/testdata/go.mod
+++ b/internal/endtoend/testdata/go.mod
@@ -1,4 +1,4 @@
-module github.com/kyleconroy/sqlc/endtoend
+module github.com/sqlc-dev/sqlc/endtoend
 
 go 1.18
 
diff --git a/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql b/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql
index 4c06fa07a0..22482fb724 100644
--- a/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql
+++ b/internal/endtoend/testdata/invalid_table_alias/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql b/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql
index 232805a4ef..76e872ab65 100644
--- a/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql
+++ b/internal/endtoend/testdata/invalid_table_alias/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
   name text      NOT NULL,
diff --git a/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql b/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql
index 4c06fa07a0..22482fb724 100644
--- a/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql
+++ b/internal/endtoend/testdata/invalid_table_alias/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/437
+-- https://github.com/sqlc-dev/sqlc/issues/437
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/mysql/query.sql b/internal/endtoend/testdata/join_left/mysql/query.sql
index 4991e59793..d6dd5edfca 100644
--- a/internal/endtoend/testdata/join_left/mysql/query.sql
+++ b/internal/endtoend/testdata/join_left/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/604
+-- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -29,7 +29,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -78,7 +78,7 @@ FROM    authors a
         LEFT JOIN super_authors sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE users_2 (
     user_id           INT PRIMARY KEY,
     user_nickname     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/postgresql/query.sql b/internal/endtoend/testdata/join_left/postgresql/query.sql
index 816f154aff..861bd34f0a 100644
--- a/internal/endtoend/testdata/join_left/postgresql/query.sql
+++ b/internal/endtoend/testdata/join_left/postgresql/query.sql
@@ -1,4 +1,4 @@
---- https://github.com/kyleconroy/sqlc/issues/604
+--- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -28,7 +28,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -77,7 +77,7 @@ FROM    authors a
         LEFT JOIN super_authors sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE "users_2" (
     "user_id"           uuid PRIMARY KEY,
     "user_nickname"     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/join_left/sqlite/query.sql b/internal/endtoend/testdata/join_left/sqlite/query.sql
index d0e45afb77..639e2d8bd2 100644
--- a/internal/endtoend/testdata/join_left/sqlite/query.sql
+++ b/internal/endtoend/testdata/join_left/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/604
+-- https://github.com/sqlc-dev/sqlc/issues/604
 CREATE TABLE users (
   user_id    INT PRIMARY KEY,
   city_id    INT -- nullable
@@ -29,7 +29,7 @@ FROM users
 LEFT JOIN cities USING (city_id)
 LEFT JOIN mayors USING (mayor_id);
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE authors (
   id        INT PRIMARY KEY,
   name      TEXT NOT NULL,
@@ -78,7 +78,7 @@ FROM    authors AS a
         LEFT JOIN super_authors AS sa
             ON a.parent_id = sa.super_id;
 
--- https://github.com/kyleconroy/sqlc/issues/1334
+-- https://github.com/sqlc-dev/sqlc/issues/1334
 CREATE TABLE users_2 (
     user_id           INT PRIMARY KEY,
     user_nickname     VARCHAR(30) UNIQUE NOT NULL,
diff --git a/internal/endtoend/testdata/missing_semicolon/mysql/query.sql b/internal/endtoend/testdata/missing_semicolon/mysql/query.sql
index b3440e7330..e04a8887c4 100644
--- a/internal/endtoend/testdata/missing_semicolon/mysql/query.sql
+++ b/internal/endtoend/testdata/missing_semicolon/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1198
+-- https://github.com/sqlc-dev/sqlc/issues/1198
 CREATE TABLE authors (
   id   INT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
diff --git a/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql b/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql
index de29787d4c..07923d53fa 100644
--- a/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql
+++ b/internal/endtoend/testdata/on_duplicate_key_update/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/921
+-- https://github.com/sqlc-dev/sqlc/issues/921
 CREATE TABLE authors (
   id   BIGINT  NOT NULL AUTO_INCREMENT PRIMARY KEY,
   name text    NOT NULL,
diff --git a/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql b/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql
index 465a8d67f7..67826c7dfc 100644
--- a/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql
+++ b/internal/endtoend/testdata/on_duplicate_key_update/postgresql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/921
+-- https://github.com/sqlc-dev/sqlc/issues/921
 CREATE TABLE authors (
   id   BIGSERIAL PRIMARY KEY,
   name text      NOT NULL UNIQUE,
diff --git a/internal/endtoend/testdata/single_param_conflict/mysql/query.sql b/internal/endtoend/testdata/single_param_conflict/mysql/query.sql
index f5b577e27f..244a747c3c 100644
--- a/internal/endtoend/testdata/single_param_conflict/mysql/query.sql
+++ b/internal/endtoend/testdata/single_param_conflict/mysql/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = ?
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub TEXT PRIMARY KEY
 );
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
index a6f4975d88..5b34cd57ba 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
@@ -59,7 +59,7 @@ WHERE   id = $1
 RETURNING id
 `
 
-// https://github.com/kyleconroy/sqlc/issues/1235
+// https://github.com/sqlc-dev/sqlc/issues/1235
 func (q *Queries) SetDefaultName(ctx context.Context, id int64) (int64, error) {
 	row := q.db.QueryRow(ctx, setDefaultName, id)
 	err := row.Scan(&id)
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql
index 45c059a3aa..6a478dc5b1 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
index d1459ccafe..bf8f2638c1 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
@@ -59,7 +59,7 @@ WHERE   id = $1
 RETURNING id
 `
 
-// https://github.com/kyleconroy/sqlc/issues/1235
+// https://github.com/sqlc-dev/sqlc/issues/1235
 func (q *Queries) SetDefaultName(ctx context.Context, id int64) (int64, error) {
 	row := q.db.QueryRow(ctx, setDefaultName, id)
 	err := row.Scan(&id)
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
index 45c059a3aa..6a478dc5b1 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go
index 8ed49e9854..4e29cf241c 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go
@@ -59,7 +59,7 @@ WHERE   id = $1
 RETURNING id
 `
 
-// https://github.com/kyleconroy/sqlc/issues/1235
+// https://github.com/sqlc-dev/sqlc/issues/1235
 func (q *Queries) SetDefaultName(ctx context.Context, id int64) (int64, error) {
 	row := q.db.QueryRowContext(ctx, setDefaultName, id)
 	err := row.Scan(&id)
diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
index 45c059a3aa..6a478dc5b1 100644
--- a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
+++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub UUID PRIMARY KEY
 );
@@ -28,7 +28,7 @@ FROM    users
 WHERE   sub = $1
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1235
+-- https://github.com/sqlc-dev/sqlc/issues/1235
 
 -- name: SetDefaultName :one
 UPDATE  authors
diff --git a/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql b/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql
index f5b577e27f..244a747c3c 100644
--- a/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql
+++ b/internal/endtoend/testdata/single_param_conflict/sqlite/query.sql
@@ -17,7 +17,7 @@ FROM    authors
 WHERE   id = ?
 LIMIT   1;
 
--- https://github.com/kyleconroy/sqlc/issues/1290
+-- https://github.com/sqlc-dev/sqlc/issues/1290
 CREATE TABLE users (
   sub TEXT PRIMARY KEY
 );
diff --git a/internal/endtoend/testdata/update_two_table/mysql/query.sql b/internal/endtoend/testdata/update_two_table/mysql/query.sql
index 1d8f9dd1e8..c67aa1fd3b 100644
--- a/internal/endtoend/testdata/update_two_table/mysql/query.sql
+++ b/internal/endtoend/testdata/update_two_table/mysql/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1590
+-- https://github.com/sqlc-dev/sqlc/issues/1590
 CREATE TABLE authors (
   name text NOT NULL,
   deleted_at datetime NOT NULL,
diff --git a/internal/endtoend/testdata/upsert/sqlite/query.sql b/internal/endtoend/testdata/upsert/sqlite/query.sql
index afd88137dd..6c9380341f 100644
--- a/internal/endtoend/testdata/upsert/sqlite/query.sql
+++ b/internal/endtoend/testdata/upsert/sqlite/query.sql
@@ -1,4 +1,4 @@
--- https://github.com/kyleconroy/sqlc/issues/1728
+-- https://github.com/sqlc-dev/sqlc/issues/1728
 
 CREATE TABLE IF NOT EXISTS locations (
     id              INTEGER PRIMARY KEY,
diff --git a/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql b/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql
index 38a93bd2b8..e6d2530f49 100644
--- a/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql
+++ b/internal/endtoend/testdata/valid_group_by_reference/mysql/query.sql
@@ -16,7 +16,7 @@ FROM     authors
 GROUP BY name;
 
 
--- https://github.com/kyleconroy/sqlc/issues/1315
+-- https://github.com/sqlc-dev/sqlc/issues/1315
 
 CREATE TABLE IF NOT EXISTS weather_metrics
 (
diff --git a/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql b/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql
index f646a796f3..602295499e 100644
--- a/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql
+++ b/internal/endtoend/testdata/valid_group_by_reference/postgresql/query.sql
@@ -15,7 +15,7 @@ FROM     authors
 GROUP BY name;
 
 
--- https://github.com/kyleconroy/sqlc/issues/1315
+-- https://github.com/sqlc-dev/sqlc/issues/1315
 
 CREATE TABLE IF NOT EXISTS weather_metrics
 (
diff --git a/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json b/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json
index 7de14d4f85..2385cc5a4b 100644
--- a/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json
+++ b/internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/sqlc.json
@@ -17,7 +17,7 @@
     {
       "name": "greeter",
       "wasm": {
-        "url": "https://github.com/kyleconroy/sqlc-gen-greeter/releases/download/v0.1.0/sqlc-gen-greeter.wasm",
+        "url": "https://github.com/sqlc-dev/sqlc-gen-greeter/releases/download/v0.1.0/sqlc-gen-greeter.wasm",
         "sha256": "afc486dac2068d741d7a4110146559d12a013fd0286f42a2fc7dcd802424ad07"
       }
     }
diff --git a/internal/ext/wasm/wasm.go b/internal/ext/wasm/wasm.go
index 52295d7e6e..7b1e756e8b 100644
--- a/internal/ext/wasm/wasm.go
+++ b/internal/ext/wasm/wasm.go
@@ -197,7 +197,7 @@ func (r *Runner) loadWASM(ctx context.Context, cache string, expected string) ([
 // removePGCatalog removes the pg_catalog schema from the request. There is a
 // mysterious (reason unknown) bug with wasm plugins when a large amount of
 // tables (like there are in the catalog) are sent.
-// @see https://github.com/kyleconroy/sqlc/pull/1748
+// @see https://github.com/sqlc-dev/sqlc/pull/1748
 func removePGCatalog(req *plugin.CodeGenRequest) {
 	if req.Catalog == nil || req.Catalog.Schemas == nil {
 		return
diff --git a/internal/inflection/singular.go b/internal/inflection/singular.go
index caff453489..edac927603 100644
--- a/internal/inflection/singular.go
+++ b/internal/inflection/singular.go
@@ -20,21 +20,21 @@ func Singular(s SingularParams) string {
 
 	// Manual fix for incorrect handling of "campus"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/430
+	// https://github.com/sqlc-dev/sqlc/issues/430
 	// https://github.com/jinzhu/inflection/issues/13
 	if strings.ToLower(s.Name) == "campus" {
 		return s.Name
 	}
 	// Manual fix for incorrect handling of "meta"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/1217
+	// https://github.com/sqlc-dev/sqlc/issues/1217
 	// https://github.com/jinzhu/inflection/issues/21
 	if strings.ToLower(s.Name) == "meta" {
 		return s.Name
 	}
 	// Manual fix for incorrect handling of "calories"
 	//
-	// https://github.com/kyleconroy/sqlc/issues/2017
+	// https://github.com/sqlc-dev/sqlc/issues/2017
 	// https://github.com/jinzhu/inflection/issues/23
 	if strings.ToLower(s.Name) == "calories" {
 		return "calorie"
diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
index 6ff6aab63d..b735e90357 100644
--- a/internal/plugin/codegen.pb.go
+++ b/internal/plugin/codegen.pb.go
@@ -1877,16 +1877,16 @@ var file_plugin_codegen_proto_rawDesc = []byte{
 	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x35, 0x0a, 0x0f, 0x43, 0x6f, 0x64, 0x65, 0x47, 0x65,
 	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x05, 0x66, 0x69, 0x6c,
 	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69,
-	0x6e, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x42, 0x7e, 0x0a,
+	0x6e, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x42, 0x7c, 0x0a,
 	0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x42, 0x0c, 0x43, 0x6f, 0x64,
-	0x65, 0x67, 0x65, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x79, 0x6c, 0x65, 0x63, 0x6f, 0x6e, 0x72,
-	0x6f, 0x79, 0x2f, 0x73, 0x71, 0x6c, 0x63, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0xa2, 0x02, 0x03, 0x50, 0x58, 0x58, 0xaa, 0x02, 0x06,
-	0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0xca, 0x02, 0x06, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0xe2,
-	0x02, 0x12, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x67, 0x65, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x71, 0x6c, 0x63, 0x2d, 0x64, 0x65, 0x76,
+	0x2f, 0x73, 0x71, 0x6c, 0x63, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70,
+	0x6c, 0x75, 0x67, 0x69, 0x6e, 0xa2, 0x02, 0x03, 0x50, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x50, 0x6c,
+	0x75, 0x67, 0x69, 0x6e, 0xca, 0x02, 0x06, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0xe2, 0x02, 0x12,
+	0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x06, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/internal/tools/sqlc-pg-gen/main.go b/internal/tools/sqlc-pg-gen/main.go
index 815828ec98..cba3b36492 100644
--- a/internal/tools/sqlc-pg-gen/main.go
+++ b/internal/tools/sqlc-pg-gen/main.go
@@ -48,8 +48,8 @@ const catalogTmpl = `
 package {{.Pkg}}
 
 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 funcs{{.GenFnName}} = []*catalog.Function {
@@ -119,8 +119,8 @@ const loaderFuncTmpl = `
 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/tools/sqlc-pg-gen/proc.go b/internal/tools/sqlc-pg-gen/proc.go
index 5f6dadf902..07629ed6ea 100644
--- a/internal/tools/sqlc-pg-gen/proc.go
+++ b/internal/tools/sqlc-pg-gen/proc.go
@@ -61,7 +61,7 @@ func (p *Proc) Args() []Arg {
 		})
 	}
 
-	// Some manual changes until https://github.com/kyleconroy/sqlc/pull/1748
+	// Some manual changes until https://github.com/sqlc-dev/sqlc/pull/1748
 	// can be completely implmented
 	if p.Name == "mode" {
 		return nil
diff --git a/internal/vet/vet.pb.go b/internal/vet/vet.pb.go
index 40a398326b..b40f109c10 100644
--- a/internal/vet/vet.pb.go
+++ b/internal/vet/vet.pb.go
@@ -1399,14 +1399,13 @@ var file_vet_vet_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x42, 0x68, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x65, 0x74, 0x42, 0x08, 0x56, 0x65, 0x74,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x27, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x79, 0x6c, 0x65, 0x63, 0x6f, 0x6e, 0x72, 0x6f, 0x79, 0x2f, 0x73,
-	0x71, 0x6c, 0x63, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x76, 0x65, 0x74,
-	0xa2, 0x02, 0x03, 0x56, 0x58, 0x58, 0xaa, 0x02, 0x03, 0x56, 0x65, 0x74, 0xca, 0x02, 0x03, 0x56,
-	0x65, 0x74, 0xe2, 0x02, 0x0f, 0x56, 0x65, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x03, 0x56, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x42, 0x66, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x65, 0x74, 0x42, 0x08, 0x56, 0x65, 0x74,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x71, 0x6c, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x73, 0x71, 0x6c,
+	0x63, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x76, 0x65, 0x74, 0xa2, 0x02,
+	0x03, 0x56, 0x58, 0x58, 0xaa, 0x02, 0x03, 0x56, 0x65, 0x74, 0xca, 0x02, 0x03, 0x56, 0x65, 0x74,
+	0xe2, 0x02, 0x0f, 0x56, 0x65, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x03, 0x56, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index 35457e06e7..c83b699c6e 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -8,7 +8,7 @@
 //	import (
 //	    "os"
 //
-//	    sqlc "github.com/kyleconroy/sqlc/pkg/cli"
+//	    sqlc "github.com/sqlc-dev/sqlc/pkg/cli"
 //	)
 //
 //	func main() {
diff --git a/placeholder.go b/placeholder.go
index a5aac43502..c53616c9fb 100644
--- a/placeholder.go
+++ b/placeholder.go
@@ -1,6 +1,6 @@
 package sqlc
 
 // This is a dummy file that allows SQLC to be "installed" as a module and locked using
-// go.mod and then run using "go run github.com/kyleconroy/sqlc"
+// go.mod and then run using "go run github.com/sqlc-dev/sqlc"
 
 type Placeholder struct{}
diff --git a/protos/buf.yaml b/protos/buf.yaml
index c07f71c53b..d2120761b6 100644
--- a/protos/buf.yaml
+++ b/protos/buf.yaml
@@ -1,5 +1,5 @@
 version: v1
-name: github.com/kyleconroy/sqlc
+name: github.com/sqlc-dev/sqlc
 breaking:
 lint:
   use:
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
index 81d3a7af5c..d9289383f9 100644
--- a/protos/plugin/codegen.proto
+++ b/protos/plugin/codegen.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package plugin;
 
-option go_package = "github.com/kyleconroy/sqlc/internal/plugin";
+option go_package = "github.com/sqlc-dev/sqlc/internal/plugin";
 
 message File {
   string name = 1 [json_name = "name"];
diff --git a/protos/vet/vet.proto b/protos/vet/vet.proto
index 9b61b98887..198c724408 100644
--- a/protos/vet/vet.proto
+++ b/protos/vet/vet.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package vet;
 
-option go_package = "github.com/kyleconroy/sqlc/internal/vet";
+option go_package = "github.com/sqlc-dev/sqlc/internal/vet";
 
 message Parameter {
   int32 number = 1 [json_name = "number"];
diff --git a/scripts/build/main.go b/scripts/build/main.go
index 3f217deb25..6841c52e74 100755
--- a/scripts/build/main.go
+++ b/scripts/build/main.go
@@ -28,7 +28,7 @@ func main() {
 
 	fmt.Printf("::set-output name=version::%s\n", version)
 
-	x := "-X github.com/kyleconroy/sqlc/internal/cmd.version=" + version
+	x := "-X github.com/sqlc-dev/sqlc/internal/cmd.version=" + version
 	args := []string{
 		"build",
 		"-ldflags", x,
diff --git a/scripts/release.go b/scripts/release.go
index ee02dc5559..a8651a6ee7 100755
--- a/scripts/release.go
+++ b/scripts/release.go
@@ -32,7 +32,7 @@ func main() {
 	}
 
 	if *docker {
-		x := "-extldflags \"-static\" -X github.com/kyleconroy/sqlc/internal/cmd.version=" + version
+		x := "-extldflags \"-static\" -X github.com/sqlc-dev/sqlc/internal/cmd.version=" + version
 		args := []string{
 			"build",
 			"-a",