diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 952d709..74a14fc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -41,7 +41,7 @@ jobs:
         run: gh release create "$GITHUB_REF_NAME" --title "Release $GITHUB_REF_NAME" --generate-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # The BSR remote plugin, so consumers can use `remote: buf.build/roderm/
+  # The BSR remote plugin, so consumers can use `remote: buf.build/snaerverk/
   # go-sqlmap` instead of installing the binary. Runs after `release` because
   # buf.plugin.yaml's license_url points at the tag's LICENSE.
   plugin:
diff --git a/CLAUDE.md b/CLAUDE.md
index a0de45b..4cae2df 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,22 +6,22 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 `protoc-gen-go-sqlmap` is a `protoc`/`buf` code-generator plugin. Given `.proto` messages annotated with `sqlmap` extensions (table/column metadata, primary keys, foreign keys), it emits a `<file>.sqlmap.go` per proto file containing `schema.v1.SchemaTable`/`SchemaColumn` values plus row-scanning helpers. `pkg/migration` then converts those values into `ariga/atlas` schema types to create tables or write migration files.
 
-The goal is a set of independently switchable plugins over one shared `TableRepo`: (1) atlas migrations — **done**; (2) queries with eager loading of children + FieldMask support — **done**; (3) SQL filters built from the filtrify AST (`github.com/roderm/filtrify`, `proto/filtrify/ast/v1/ast.proto`). Note `docs/plans/sqlmap-generator/PLAN-SQLMAP-GENERATOR.md` is stale on (3): its Phase 5 sketches ad-hoc per-column builder funcs rather than translating an external AST.
+The goal is a set of independently switchable plugins over one shared `TableRepo`: (1) atlas migrations — **done**; (2) queries with eager loading of children + FieldMask support — **done**; (3) SQL filters built from the filtrify AST (`github.com/snaerverk/filtrify`, `proto/filtrify/ast/v1/ast.proto`). Note `docs/plans/sqlmap-generator/PLAN-SQLMAP-GENERATOR.md` is stale on (3): its Phase 5 sketches ad-hoc per-column builder funcs rather than translating an external AST.
 
 Plugins are toggled with the `plugins=` protoc parameter, a **`+`-separated** list (protoc already uses `,` between parameters): `--go-sqlmap_out=plugins=schema+scanner:.`. Omitting it enables everything. `plugins` entries live in one slice in `generator.go`; `query` declares `Requires: ["scanner"]` because its output calls the scanner's `Result` type, and enabling it alone is a generation-time error rather than uncompilable Go.
 
 ### BSR remote plugin
 
-`buf.plugin.yaml` + `Dockerfile` publish the generator as `buf.build/roderm/go-sqlmap`, so consumers need no local binary:
+`buf.plugin.yaml` + `Dockerfile` publish the generator as `buf.build/snaerverk/go-sqlmap`, so consumers need no local binary:
 
 ```yaml
 plugins:
-  - remote: buf.build/roderm/go-sqlmap:v0.1.0
+  - remote: buf.build/snaerverk/go-sqlmap:v0.1.0
     out: pkg/generated/
     opt: [paths=source_relative, plugins=schema+scanner+query]
 ```
 
-`buf.plugin.yaml` pins the runtime module the generated code imports (`pkg/query`, `pkg/generated/schema/v1`), so `plugin_version` and `registry.go.deps` must both match the git tag — the release workflow fails if they drift. Publishing happens in CI on tag (`buf beta registry plugin push`, needs `BUF_TOKEN`); it is a separate resource from the `buf.build/roderm/protoc-gen-go-sqlmap` *module* that carries the protos. Test the image locally with `docker build -t x . && protoc --plugin=protoc-gen-y=<script running 'docker run --rm -i x'>`.
+`buf.plugin.yaml` pins the runtime module the generated code imports (`pkg/query`, `pkg/generated/schema/v1`), so `plugin_version` and `registry.go.deps` must both match the git tag — the release workflow fails if they drift. Publishing happens in CI on tag (`buf beta registry plugin push`, needs `BUF_TOKEN`); it is a separate resource from the `buf.build/snaerverk/protoc-gen-go-sqlmap` *module* that carries the protos. Test the image locally with `docker build -t x . && protoc --plugin=protoc-gen-y=<script running 'docker run --rm -i x'>`.
 
 **Dependency rule: only `ariga.io/atlas` and `google.golang.org/protobuf` are allowed as direct dependencies.** Ask before adding any other, test-only ones included — prefer plain stdlib loops over utility libraries. Target Go 1.27.
 
diff --git a/Dockerfile b/Dockerfile
index cd1f9d8..2151700 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# Image for the BSR remote plugin (buf.build/roderm/go-sqlmap).
+# Image for the BSR remote plugin (buf.build/snaerverk/go-sqlmap).
 # Built and pushed by `buf beta registry plugin push`, which requires
 # linux/amd64, a minimal base and a non-root user.
 FROM --platform=$BUILDPLATFORM golang:1.27-alpine AS build
diff --git a/README.md b/README.md
index 9258034..69df863 100644
--- a/README.md
+++ b/README.md
@@ -1,75 +1,152 @@
-# protoc-gen-go-sqlmap:
-[![test](https://github.com/roderm/protoc-gen-go-sqlmap/actions/workflows/test.yaml/badge.svg)](https://github.com/roderm/protoc-gen-go-sqlmap/actions/workflows/test.yaml)
-This is a protobuf-plugin to generate SQL-Select mappers in go to insert, update and query protbuf messages directly from tables or views.
+# protoc-gen-go-sqlmap
+
+[![test](https://github.com/snaerverk/protoc-gen-go-sqlmap/actions/workflows/test.yaml/badge.svg)](https://github.com/snaerverk/protoc-gen-go-sqlmap/actions/workflows/test.yaml)
+[![Go Reference](https://pkg.go.dev/badge/github.com/snaerverk/protoc-gen-go-sqlmap.svg)](https://pkg.go.dev/github.com/snaerverk/protoc-gen-go-sqlmap)
+
+`protoc`/`buf` plugin that turns `.proto` messages annotated with `sqlmap` extensions (table/column metadata, primary keys, foreign keys) into a `<file>.sqlmap.go` per proto file, containing:
+
+- **`schema`** — `schema.v1.SchemaTable`/`SchemaColumn` values describing every table, consumed by [`pkg/migration`](pkg/migration) to create tables (via [ariga/atlas](https://atlasgo.io)) or generate migration files.
+- **`scanner`** — a `<Message>Result` struct per table with `Scan`, `GetColValue`, and column-list helpers, for reading rows into Go without reflection.
+- **`query`** — FieldMask-aware `Load<Message>`/`Load<Message>Rows` functions that select only requested columns and eagerly load related messages (one batched `IN (...)` per relation, stitched in Go), consumed by [`pkg/query`](pkg/query).
+
+These are independently switchable via the `plugins=` parameter (see below); `schema`, `scanner`, and `query` are the three plugins that exist today.
+
+## Install
 
-## Usage:
-Install with:
 ```bash
-go install github.com/roderm/protoc-gen-go-sqlmap
+go install github.com/snaerverk/protoc-gen-go-sqlmap/cmd/protoc-gen-go-sqlmap@latest
 ```
-### protoc 
+
+### protoc
+
+```bash
+protoc --go-sqlmap_out=paths=source_relative:. your.proto
+```
+
+Optional `plugins=` parameter (comma-separated, protoc-style) selects which of `schema`, `scanner`, `query` to emit, `+`-separated:
+
 ```bash
-protoc --go-sqlmap_out=. [your-protobuf-definition].proto
+protoc --go-sqlmap_out=plugins=schema+scanner+query,paths=source_relative:. your.proto
 ```
+
+Omit `plugins=` to enable all three. `query` requires `scanner` to also be enabled, since its output calls the scanner's `Result` type. The schema writer emits a `SchemaType` entry for every dialect (mysql/postgres/sqlite3) regardless — the actual dialect is chosen at runtime by `migration.New`, not at generation time.
+
 ### buf
-* add dependency `buf.build/roderm/protoc-gen-go-sqlmap`
-* add `go-sqlmap` and `go` to your `buf.gen.yaml`
 
-To make use of this plugin, add following extensions to you .proto-file:
+Add the plugin to `buf.gen.yaml`, either from BSR (no local install needed):
+
+```yaml
+plugins:
+  - remote: buf.build/snaerverk/go-sqlmap:v0.1.0
+    out: pkg/generated/
+    opt: [paths=source_relative, plugins=schema+scanner+query]
+```
+
+or as a local binary after `go install`:
+
+```yaml
+plugins:
+  - local: protoc-gen-go-sqlmap
+    out: pkg/generated/
+    opt: [paths=source_relative]
+```
+
+## Annotating messages
+
+Import `sqlmap/v1/sqlmap.proto` and annotate tables and columns:
+
 ```proto
-import "github.com/roderm/protoc-gen-go-sqlmap/proto/sqlgen/sqlgen.proto" // Import of the extensions
-// or with buf
-import "proto/sqlgen/sqlgen.proto"
-
-message Some {
-    option (sqlgen.table) = {name:"tbl_some", crud:[R]}; // table name and generate read-function
-    string Id = 1 [(sqlgen.col) = {pk: AUTO, name = "some_id" }]; // It's an autogenerated key in the field "some_id"
-    repeated Attribute Attributes = 2; [(sqlgeb.col) = {name "some_id",fk = "tbl_some_attributes.some_id"}]; // Make a one-to-many link to load
+syntax = "proto3";
+
+package example;
+
+import "sqlmap/v1/sqlmap.proto";
+
+option go_package = "example/examplepb";
+
+message Author {
+  option (sqlmap.v1.table) = { name: "tbl_author" };
+  int64 id = 1 [(sqlmap.v1.col) = { fieldname: "author_id", pk: PK_AUTO }];
+  string name = 2 [(sqlmap.v1.col) = { fieldname: "author_name" }];
+
+  // has-many: the key lives on tbl_book (author_id), not here.
+  repeated Book books = 3 [(sqlmap.v1.col) = {
+    foreign_key: { entity: "Book", fieldnames: ["author_id"] }
+  }];
 }
 
-message Attribute {
-    option (sqlgen.table) = {name:"tbl_some_attributes", crud:[C,R,D]}; // genereate insert,select and delete function
-    string Id = 1 [(sqlgen.col) = {pk= AUTO, name = "attributes_id" }];
-    string Name = 2 [(sqlgeb.col).name = "attributes_name"];
-    bytes Value = 3 [(sqlgeb.col).name = "attributes_value"];
-    Some Parent = 4 [(sqlgeb.col) = {name: "some_id", fk = "tbl_some.some_id"}]; // Make a one-to-one link to load
+message Book {
+  option (sqlmap.v1.table) = {
+    name: "tbl_book"
+    foreign_keys: [{
+      fieldnames: ["author_id"]
+      to: { entity: "Author", fieldnames: ["author_id"] }
+      on_delete: ON_DELETE_CASCADE
+    }]
+  };
+  int64 id = 1 [(sqlmap.v1.col) = { fieldname: "book_id", pk: PK_AUTO }];
+  string title = 2 [(sqlmap.v1.col) = { fieldname: "book_title" }];
+  // proto3 optional gives this field presence, so it's nullable; a bare
+  // scalar has no presence and would generate NOT NULL instead.
+  optional int64 author_id = 3 [(sqlmap.v1.col) = { fieldname: "author_id" }];
 }
 ```
 
-After generation of the .sqlmap.go-file you should be able to load the data as following:
+- `pk: PK_AUTO` for a database-generated key, `PK_MAN` for one the application supplies.
+- A `message`-kind field with `foreign_key` is a relation: `repeated` is has-many (relation only, no column); a singular field is belongs-to (both a column holding the key and a relation).
+- Nullability: an explicit `nullable` on the column wins; otherwise PKs are `NOT NULL` and every other column follows the proto field's presence — a `proto3 optional` or message-kind field has presence and is nullable, a bare proto3 scalar does not and becomes `NOT NULL`.
+- A `message`-kind field *without* a `foreign_key` is stored as an embedded `JSON` column.
+
+See [`proto/sqlmap/v1/sqlmap.proto`](proto/sqlmap/v1/sqlmap.proto) for the full extension surface (`ForeignKeyDefinition`, per-dialect `type` overrides) and [`docs/design/DESIGN-SUBTYPE-TABLES.md`](docs/design/DESIGN-SUBTYPE-TABLES.md) for joined-table subtype hierarchies (`oneof` + `(sqlmap.v1.subtypes)`).
+
+## Using the generated code
+
 ```go
-store = package.NewStore(db_conn)
-rows, err = store.Some(context.TODO(), package.SomeWithAttributes())
+db, _ := sql.Open("postgres", dsn)
+
+// Create tables from the generated schema (or use m.Diff/ApplyPending for
+// migration files instead).
+m, err := migration.New(db, migration.DialectPostgres)
+if err != nil {
+    return err
+}
+if err := m.Create(ctx, examplepb.AuthorTable, examplepb.BookTable); err != nil {
+    return err
+}
+
+// Load authors with their books' titles eagerly loaded, selecting only the
+// columns the FieldMask asks for.
+conn := query.Conn{DB: db, Dialect: query.Postgres}
+authors, err := examplepb.LoadAuthor(ctx, conn,
+    &fieldmaskpb.FieldMask{Paths: []string{"name", "books.title"}})
+```
+
+`LoadAuthor` also takes `...query.Cond` filters (build one with `query.In(col, values)`, which reports whether the value slice was non-empty). For row-level access without eager loading, use `<Message>Result.Scan` directly against `GetAuthorColumns()`/`GetAuthorPKColumns()`.
+
+## Commands
+
+```bash
+task install         # go mod tidy && go install ./cmd/protoc-gen-go-sqlmap/
+make install          # buf generate && go install (regenerates pkg/generated/** from proto/)
+buf generate          # regenerate pkg/generated/**.pb.go from proto/
+go build ./...
+go test ./...                                            # golden + unit tests
+go test ./pkg/generator/sqlmap/ -update                  # accept new golden output
+SQLMAP_E2E=1 go test ./pkg/generator/sqlmap/ -run TestE2E # dockerized-Postgres end-to-end
 ```
 
-Additional there can be given extra parameters for filtering (Currently only forks for Postgres/Cockroach):
-`store.Some(context.TODO(), SomeFilter(pg.EQ("some_id", "some_id"))`
-or for the sub-query:
-`store.Some(context.TODO(), package.SomeWithAttributes(AttributeFilter(pg.EQ("name", "FirstArgument")))`
-
-## [Docs](https://pkg.go.dev/github.com/roderm/protoc-gen-go-sqlmap)
-## Roadmap:
-- [-] Queries
-	- [x] loading of one-to-many
-	- [x] loading of one-to-one
-	- [ ] add parameter to not resolve references (problem with json-encoding)
-- [-] Insert
-	- [x] Insert single message to table
-	- [ ] resolve foreign-key (and create)
-- [x] Delete
-	- [x] delete a data-row
-- [ ] Implement update
-	- Should have use replace and conflict handling parameter
-- [x] Decouple gogo
-- [x] Write generator test 
-- [ ] Support multiple PKs
-- [ ] Add multiple FKs for single Message
-- [ ] Support `oneOf` type in proto3
-- [ ] Improve filter to no use column-names
-- [x] Load external messages to resolve foreign keys
-- [ ] Implement more Database-Engines & syntax's
-    - [ ] CockroachDB
-    - [x] PostgreSQL
-    - [ ] MySQL / MariaDB
-	- [ ] MSSQL
-	- [ ] SQLite
+## Docs
+
+- [pkg.go.dev](https://pkg.go.dev/github.com/snaerverk/protoc-gen-go-sqlmap)
+- [`docs/design/DESIGN-SUBTYPE-TABLES.md`](docs/design/DESIGN-SUBTYPE-TABLES.md) — joined-table subtype hierarchies.
+- [`docs/design/DESIGN-FILTRIFY-CONDITIONS.md`](docs/design/DESIGN-FILTRIFY-CONDITIONS.md) — planned: translating a [filtrify](https://github.com/snaerverk/filtrify) AST into SQL filters at runtime.
+
+## Roadmap
+
+- [x] Schema generation + atlas-backed migrations (create tables, diff, migration files)
+- [x] FieldMask-aware queries with eager loading (has-many and belongs-to, arbitrary depth)
+- [x] Joined-table subtypes (`oneof` enforced as a DB-level FK/CHECK constraint)
+- [x] Multiple dialects: PostgreSQL, MySQL/MariaDB, SQLite
+- [x] Published as a BSR remote plugin (`buf.build/snaerverk/go-sqlmap`)
+- [ ] SQL filters translated at runtime from a [filtrify](https://github.com/snaerverk/filtrify) AST, replacing ad-hoc `query.Cond` construction
+- [ ] Insert/update helpers (currently out of scope; `pkg/migration` only creates schema, `pkg/query` only reads)
diff --git a/buf.gen.yaml b/buf.gen.yaml
index b79e476..a97b224 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -3,7 +3,7 @@ managed:
   enabled: true
   override:
     - file_option: go_package_prefix
-      value: github.com/roderm/protoc-gen-go-sqlmap/pkg/generated
+      value: github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated
 plugins:
   - remote: buf.build/protocolbuffers/go
     out: pkg/generated
@@ -11,7 +11,7 @@ plugins:
       - paths=source_relative
       - Mgoogle/type/datetime.proto=google.golang.org/genproto/googleapis/type/datetime
 
-  # - remote: buf.build/roderm/sqlmap
+  # - remote: buf.build/snaerverk/sqlmap
   #   out: pkg/generated/sqlmap
   #   opt:
   #     - dialect=mysql
diff --git a/buf.plugin.yaml b/buf.plugin.yaml
index 5324b7f..64af934 100644
--- a/buf.plugin.yaml
+++ b/buf.plugin.yaml
@@ -1,13 +1,13 @@
 version: v1
-name: buf.build/roderm/go-sqlmap
+name: buf.build/snaerverk/go-sqlmap
 # Keep in step with the git tag: registry.go.deps below pins the runtime
 # packages the generated code imports, and they ship from this repo.
 plugin_version: v0.1.0
 
 description: Generates SQL schema definitions, row scanners and FieldMask-aware queries with eager loading from sqlmap-annotated messages.
-source_url: https://github.com/roderm/protoc-gen-go-sqlmap
+source_url: https://github.com/snaerverk/protoc-gen-go-sqlmap
 spdx_license_id: MIT
-license_url: https://github.com/roderm/protoc-gen-go-sqlmap/blob/v0.1.0/LICENSE
+license_url: https://github.com/snaerverk/protoc-gen-go-sqlmap/blob/v0.1.0/LICENSE
 output_languages:
   - go
 
@@ -22,7 +22,7 @@ registry:
     deps:
       # pkg/generated/schema/v1 (SchemaTable/SchemaColumn) and pkg/query
       # (Mask, Conn) are imported by the generated code.
-      - module: github.com/roderm/protoc-gen-go-sqlmap
+      - module: github.com/snaerverk/protoc-gen-go-sqlmap
         version: v0.1.0
       - module: google.golang.org/protobuf
         version: v1.36.11
diff --git a/buf.yaml b/buf.yaml
index 13513ec..311af70 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,7 +1,7 @@
 version: v2
 modules:
   - path: proto/
-    name: buf.build/roderm/protoc-gen-go-sqlmap
+    name: buf.build/snaerverk/protoc-gen-go-sqlmap
 deps:
   - buf.build/googleapis/googleapis
 lint:
diff --git a/cmd/protoc-gen-go-sqlmap/main.go b/cmd/protoc-gen-go-sqlmap/main.go
index ccc1b2b..49dcc59 100644
--- a/cmd/protoc-gen-go-sqlmap/main.go
+++ b/cmd/protoc-gen-go-sqlmap/main.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/generator/sqlmap"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generator/sqlmap"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/pluginpb"
diff --git a/docs/design/DESIGN-SUBTYPE-TABLES.md b/docs/design/DESIGN-SUBTYPE-TABLES.md
index aa1a391..0fa36f1 100644
--- a/docs/design/DESIGN-SUBTYPE-TABLES.md
+++ b/docs/design/DESIGN-SUBTYPE-TABLES.md
@@ -2,7 +2,7 @@
 
 Status: **implemented** for the schema half — the discriminator column, CHECK constraints, unique index and composite foreign key are generated and enforced. Eager loading of subtypes (the section near the end) is **not** implemented yet.
 
-Consumers pulling the extensions from `buf.build/roderm/protoc-gen-go-sqlmap` need a `buf push` before they can use `subtypes` / `subtype_of`.
+Consumers pulling the extensions from `buf.build/snaerverk/protoc-gen-go-sqlmap` need a `buf push` before they can use `subtypes` / `subtype_of`.
 
 ## The problem
 
diff --git a/go.mod b/go.mod
index 341a949..b417fa1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/roderm/protoc-gen-go-sqlmap
+module github.com/snaerverk/protoc-gen-go-sqlmap
 
 go 1.27
 
diff --git a/pkg/generated/schema/v1/schema.pb.go b/pkg/generated/schema/v1/schema.pb.go
index 7b73fb1..9da5d28 100644
--- a/pkg/generated/schema/v1/schema.pb.go
+++ b/pkg/generated/schema/v1/schema.pb.go
@@ -511,8 +511,8 @@ const file_schema_v1_schema_proto_rawDesc = "" +
 	"\bOnDelete\x12\x19\n" +
 	"\x15ON_DELETE_UNSPECIFIED\x10\x00\x12\x15\n" +
 	"\x11ON_DELETE_CASCADE\x10\x01\x12\x16\n" +
-	"\x12ON_DELETE_SET_NULL\x10\x02B\xaa\x01\n" +
-	"\rcom.schema.v1B\vSchemaProtoP\x01ZGgithub.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1;schemav1\xa2\x02\x03SXX\xaa\x02\tSchema.V1\xca\x02\tSchema\\V1\xe2\x02\x15Schema\\V1\\GPBMetadata\xea\x02\n" +
+	"\x12ON_DELETE_SET_NULL\x10\x02B\xad\x01\n" +
+	"\rcom.schema.v1B\vSchemaProtoP\x01ZJgithub.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1;schemav1\xa2\x02\x03SXX\xaa\x02\tSchema.V1\xca\x02\tSchema\\V1\xe2\x02\x15Schema\\V1\\GPBMetadata\xea\x02\n" +
 	"Schema::V1b\x06proto3"
 
 var (
diff --git a/pkg/generated/sqlmap/v1/sqlmap.pb.go b/pkg/generated/sqlmap/v1/sqlmap.pb.go
index 307469a..ca20be7 100644
--- a/pkg/generated/sqlmap/v1/sqlmap.pb.go
+++ b/pkg/generated/sqlmap/v1/sqlmap.pb.go
@@ -7,7 +7,7 @@
 package sqlmapv1
 
 import (
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
@@ -498,8 +498,8 @@ const file_sqlmap_v1_sqlmap_proto_rawDesc = "" +
 	"\ton_delete\x18\x04 \x01(\x0e2\x13.schema.v1.OnDeleteR\bonDelete:I\n" +
 	"\x05table\x12\x1f.google.protobuf.MessageOptions\x18\xe4\xea0 \x01(\v2\x10.sqlmap.v1.TableR\x05table:D\n" +
 	"\x03col\x12\x1d.google.protobuf.FieldOptions\x18\xf8\xea0 \x01(\v2\x11.sqlmap.v1.ColumnR\x03col:P\n" +
-	"\bsubtypes\x12\x1d.google.protobuf.OneofOptions\x18\x8c\xeb0 \x01(\v2\x13.sqlmap.v1.SubtypesR\bsubtypesB\xaa\x01\n" +
-	"\rcom.sqlmap.v1B\vSqlmapProtoP\x01ZGgithub.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1;sqlmapv1\xa2\x02\x03SXX\xaa\x02\tSqlmap.V1\xca\x02\tSqlmap\\V1\xe2\x02\x15Sqlmap\\V1\\GPBMetadata\xea\x02\n" +
+	"\bsubtypes\x12\x1d.google.protobuf.OneofOptions\x18\x8c\xeb0 \x01(\v2\x13.sqlmap.v1.SubtypesR\bsubtypesB\xad\x01\n" +
+	"\rcom.sqlmap.v1B\vSqlmapProtoP\x01ZJgithub.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1;sqlmapv1\xa2\x02\x03SXX\xaa\x02\tSqlmap.V1\xca\x02\tSqlmap\\V1\xe2\x02\x15Sqlmap\\V1\\GPBMetadata\xea\x02\n" +
 	"Sqlmap::V1"
 
 var (
diff --git a/pkg/generator/sqlmap/e2e_test.go b/pkg/generator/sqlmap/e2e_test.go
index ca19090..eec730f 100644
--- a/pkg/generator/sqlmap/e2e_test.go
+++ b/pkg/generator/sqlmap/e2e_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"e2etest/relationpb"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/migration"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/migration"
 )
 
 func run(ctx context.Context, db *sql.DB) error {
@@ -90,8 +90,8 @@ import (
 	"time"
 
 	"e2etest/eagerpb"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/migration"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/migration"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
@@ -260,7 +260,7 @@ import (
 	"fmt"
 
 	"e2etest/subtypepb"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/migration"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/migration"
 )
 
 func run(ctx context.Context, db *sql.DB) error {
@@ -455,8 +455,8 @@ func runE2E(t *testing.T, protoFile, pkgName, driverSrc string) {
 		"-I", filepath.Join(repoRoot, "proto"),
 		"-I", testdata,
 		"--go_out=paths=source_relative,"+
-			"Msqlmap/v1/sqlmap.proto=github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1,"+
-			"Mschema/v1/schema.proto=github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1:"+pbOutDir,
+			"Msqlmap/v1/sqlmap.proto=github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1,"+
+			"Mschema/v1/schema.proto=github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1:"+pbOutDir,
 		filepath.Join(testdata, protoFile),
 	)
 	if out, err := cmd.CombinedOutput(); err != nil {
@@ -505,8 +505,8 @@ func runE2E(t *testing.T, protoFile, pkgName, driverSrc string) {
 		return string(out)
 	}
 	run("go", "mod", "edit",
-		"-require=github.com/roderm/protoc-gen-go-sqlmap@v0.0.0",
-		"-replace=github.com/roderm/protoc-gen-go-sqlmap="+repoRoot,
+		"-require=github.com/snaerverk/protoc-gen-go-sqlmap@v0.0.0",
+		"-replace=github.com/snaerverk/protoc-gen-go-sqlmap="+repoRoot,
 	)
 	run("go", "mod", "tidy")
 
diff --git a/pkg/generator/sqlmap/generator.go b/pkg/generator/sqlmap/generator.go
index c8d4cf8..223bc90 100644
--- a/pkg/generator/sqlmap/generator.go
+++ b/pkg/generator/sqlmap/generator.go
@@ -5,11 +5,11 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer/query"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer/scanner"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer/schema"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer/query"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer/scanner"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer/schema"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/types/pluginpb"
 )
diff --git a/pkg/generator/sqlmap/golden_test.go b/pkg/generator/sqlmap/golden_test.go
index e071a80..da59f8b 100644
--- a/pkg/generator/sqlmap/golden_test.go
+++ b/pkg/generator/sqlmap/golden_test.go
@@ -62,8 +62,8 @@ func buildRequest(t *testing.T, protoFile, extra string) *pluginpb.CodeGenerator
 	}
 
 	param := "paths=source_relative," +
-		"Msqlmap/v1/sqlmap.proto=github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1," +
-		"Mschema/v1/schema.proto=github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+		"Msqlmap/v1/sqlmap.proto=github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1," +
+		"Mschema/v1/schema.proto=github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
 	if extra != "" {
 		param += "," + extra
 	}
diff --git a/pkg/generator/sqlmap/testdata/eager.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/eager.sqlmap.go.golden
index 761be5e..0e37e75 100644
--- a/pkg/generator/sqlmap/testdata/eager.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/eager.sqlmap.go.golden
@@ -4,8 +4,8 @@ import (
 	context "context"
 	sql "database/sql"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
diff --git a/pkg/generator/sqlmap/testdata/foreignkey.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/foreignkey.sqlmap.go.golden
index 87133f4..0052a78 100644
--- a/pkg/generator/sqlmap/testdata/foreignkey.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/foreignkey.sqlmap.go.golden
@@ -3,8 +3,8 @@ package foreignkeypb
 import (
 	context "context"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
diff --git a/pkg/generator/sqlmap/testdata/relation.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/relation.sqlmap.go.golden
index 63808bf..13ac3e0 100644
--- a/pkg/generator/sqlmap/testdata/relation.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/relation.sqlmap.go.golden
@@ -3,8 +3,8 @@ package relationpb
 import (
 	context "context"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
diff --git a/pkg/generator/sqlmap/testdata/simple.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/simple.sqlmap.go.golden
index 9530885..abfb79d 100644
--- a/pkg/generator/sqlmap/testdata/simple.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/simple.sqlmap.go.golden
@@ -3,8 +3,8 @@ package simplepb
 import (
 	context "context"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
diff --git a/pkg/generator/sqlmap/testdata/subtype.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/subtype.sqlmap.go.golden
index bcedf81..69a0017 100644
--- a/pkg/generator/sqlmap/testdata/subtype.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/subtype.sqlmap.go.golden
@@ -3,8 +3,8 @@ package subtypepb
 import (
 	context "context"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
diff --git a/pkg/generator/sqlmap/testdata/subtype_fieldnames.sqlmap.go.golden b/pkg/generator/sqlmap/testdata/subtype_fieldnames.sqlmap.go.golden
index df6dffa..27ecd9b 100644
--- a/pkg/generator/sqlmap/testdata/subtype_fieldnames.sqlmap.go.golden
+++ b/pkg/generator/sqlmap/testdata/subtype_fieldnames.sqlmap.go.golden
@@ -3,8 +3,8 @@ package sfpb
 import (
 	context "context"
 	fmt "fmt"
-	v1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	query "github.com/roderm/protoc-gen-go-sqlmap/pkg/query"
+	v1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	query "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query"
 	proto "google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
diff --git a/pkg/generator/sqlmap/types/column.go b/pkg/generator/sqlmap/types/column.go
index 2a64fd1..1a4cc93 100644
--- a/pkg/generator/sqlmap/types/column.go
+++ b/pkg/generator/sqlmap/types/column.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	sqlmapv1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	sqlmapv1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/pkg/generator/sqlmap/types/relation.go b/pkg/generator/sqlmap/types/relation.go
index c4d554f..a56ca04 100644
--- a/pkg/generator/sqlmap/types/relation.go
+++ b/pkg/generator/sqlmap/types/relation.go
@@ -3,8 +3,8 @@ package types
 import (
 	"fmt"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	sqlmapv1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	sqlmapv1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
diff --git a/pkg/generator/sqlmap/types/subtype.go b/pkg/generator/sqlmap/types/subtype.go
index a43b868..a34ad4c 100644
--- a/pkg/generator/sqlmap/types/subtype.go
+++ b/pkg/generator/sqlmap/types/subtype.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	sqlmapv1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
+	sqlmapv1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/pkg/generator/sqlmap/types/table.go b/pkg/generator/sqlmap/types/table.go
index 973183f..4361815 100644
--- a/pkg/generator/sqlmap/types/table.go
+++ b/pkg/generator/sqlmap/types/table.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	sqlmapv1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
+	sqlmapv1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/pkg/migration/migration.go b/pkg/migration/migration.go
index 6dc8d28..45a6f9b 100644
--- a/pkg/migration/migration.go
+++ b/pkg/migration/migration.go
@@ -15,7 +15,7 @@ import (
 	"ariga.io/atlas/sql/schema"
 	"ariga.io/atlas/sql/sqlite"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
 )
 
 // Dialect names accepted by New.
diff --git a/pkg/migration/migration_test.go b/pkg/migration/migration_test.go
index 9098d45..4545e10 100644
--- a/pkg/migration/migration_test.go
+++ b/pkg/migration/migration_test.go
@@ -6,7 +6,7 @@ import (
 
 	"ariga.io/atlas/sql/schema"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
 )
 
 // newCol builds a VARCHAR test column, except for PK_AUTO columns: an
diff --git a/pkg/writer/query/writer.go b/pkg/writer/query/writer.go
index eb58a37..60c922e 100644
--- a/pkg/writer/query/writer.go
+++ b/pkg/writer/query/writer.go
@@ -8,13 +8,13 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer"
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
 const (
-	queryImportPath     = protogen.GoImportPath("github.com/roderm/protoc-gen-go-sqlmap/pkg/query")
+	queryImportPath     = protogen.GoImportPath("github.com/snaerverk/protoc-gen-go-sqlmap/pkg/query")
 	fieldmaskImportPath = protogen.GoImportPath("google.golang.org/protobuf/types/known/fieldmaskpb")
 	contextImportPath   = protogen.GoImportPath("context")
 )
diff --git a/pkg/writer/scanner/writer.go b/pkg/writer/scanner/writer.go
index ba6dd77..992f518 100644
--- a/pkg/writer/scanner/writer.go
+++ b/pkg/writer/scanner/writer.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"text/template"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
-	sqlmapv1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	sqlmapv1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/sqlmap/v1"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
diff --git a/pkg/writer/schema/writer.go b/pkg/writer/schema/writer.go
index aa4d2e4..d8fdf5d 100644
--- a/pkg/writer/schema/writer.go
+++ b/pkg/writer/schema/writer.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"text/template"
 
-	schemav1 "github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
+	schemav1 "github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1"
 
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
-	"github.com/roderm/protoc-gen-go-sqlmap/pkg/writer"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generator/sqlmap/types"
+	"github.com/snaerverk/protoc-gen-go-sqlmap/pkg/writer"
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
@@ -18,7 +18,7 @@ import (
 var dialects = []string{"mysql", "postgres", "sqlite3"}
 
 // schemaV1ImportPath holds the SchemaTable/SchemaColumn types this writer emits.
-const schemaV1ImportPath = protogen.GoImportPath("github.com/roderm/protoc-gen-go-sqlmap/pkg/generated/schema/v1")
+const schemaV1ImportPath = protogen.GoImportPath("github.com/snaerverk/protoc-gen-go-sqlmap/pkg/generated/schema/v1")
 
 // protoImportPath supplies proto.String() for the schema.v1 *string fields.
 const protoImportPath = protogen.GoImportPath("google.golang.org/protobuf/proto")