diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..c0712ac
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+ * @odsod @ericwenn
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..0e0b0a1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: gomod
+    directory: /
+    schedule:
+      interval: daily
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..ae4f716
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,60 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  make:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Setup Node
+        uses: actions/setup-node@v2.4.0
+        with:
+          node-version: 12
+
+      - name: Make
+        run: make
+
+  release:
+    needs: [make]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Setup Node
+        uses: actions/setup-node@v2.4.0
+        with:
+          node-version: 12
+
+      - name: Run semantic-release
+        run: make semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run goreleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 443313b..f116c61 100644
--- a/Makefile
+++ b/Makefile
@@ -34,16 +34,16 @@ buf-lint: $(buf)
 	$(info [$@] linting protobuf schemas...)
 	@$(buf) lint
 
-protoc_gen_go_aiptest := ./bin/protoc-gen-go-aiptest
-export PATH := $(dir $(abspath $(protoc_gen_go_aiptest))):$(PATH)
+protoc_gen_go_aip_test := ./bin/protoc-gen-go-aip-test
+export PATH := $(dir $(abspath $(protoc_gen_go_aip_test))):$(PATH)
 
-.PHONY: $(protoc_gen_go_aiptest)
-$(protoc_gen_go_aiptest):
+.PHONY: $(protoc_gen_go_aip_test)
+$(protoc_gen_go_aip_test):
 	$(info [$@] building binary...)
 	@go build -o $@ .
 
 .PHONY: buf-generate
-buf-generate: $(buf) $(protoc_gen_go_aiptest) $(protoc_gen_go) $(protoc_gen_go_grpc)
+buf-generate: $(buf) $(protoc_gen_go_aip_test) $(protoc_gen_go) $(protoc_gen_go_grpc)
 	$(info [$@] generating protobuf stubs...)
 	@rm -rf proto/gen
 	@$(buf) generate --path proto/src/einride
diff --git a/buf.gen.yaml b/buf.gen.yaml
index ae22c2a..9c7c7d2 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -3,12 +3,12 @@ version: v1beta1
 plugins:
   - name: go
     out: proto/gen
-    opt: module=github.com/einride/protoc-gen-go-aiptest/proto/gen
+    opt: module=github.com/einride/protoc-gen-go-aip-test/proto/gen
 
   - name: go-grpc
     out: proto/gen
-    opt: module=github.com/einride/protoc-gen-go-aiptest/proto/gen
+    opt: module=github.com/einride/protoc-gen-go-aip-test/proto/gen
 
-  - name: go-aiptest
+  - name: go-aip-test
     out: proto/gen
-    opt: module=github.com/einride/protoc-gen-go-aiptest/proto/gen
+    opt: module=github.com/einride/protoc-gen-go-aip-test/proto/gen
diff --git a/buf.yaml b/buf.yaml
index f996a01..38aea1e 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,6 +1,6 @@
 version: v1beta1
 
-name: buf.build/einride/protoc-gen-go-aiptest
+name: buf.build/einride/protoc-gen-go-aip-test
 
 deps:
   - buf.build/beta/googleapis
diff --git a/go.mod b/go.mod
index 2064eaf..d174554 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/einride/protoc-gen-go-aiptest
+module github.com/einride/protoc-gen-go-aip-test
 
 go 1.15
 
diff --git a/internal/plugin/generate.go b/internal/plugin/generate.go
index 8caa914..25b0443 100644
--- a/internal/plugin/generate.go
+++ b/internal/plugin/generate.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/einride/protoc-gen-go-aiptest/internal/xrange"
+	"github.com/einride/protoc-gen-go-aip-test/internal/xrange"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -76,7 +76,7 @@ func goImportPath(file *protogen.File) protogen.GoImportPath {
 }
 
 func writeHeader(file *protogen.File, f *protogen.GeneratedFile) {
-	f.P("// Code generated by protoc-gen-go-aiptest. DO NOT EDIT.")
+	f.P("// Code generated by protoc-gen-go-aip-test. DO NOT EDIT.")
 	f.P()
 	f.P("package ", file.GoPackageName+pkgNameSuffix)
 	f.P()
diff --git a/internal/plugin/helper.go b/internal/plugin/helper.go
index 0e23628..e3024cc 100644
--- a/internal/plugin/helper.go
+++ b/internal/plugin/helper.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/einride/protoc-gen-go-aiptest/internal/xrange"
+	"github.com/einride/protoc-gen-go-aip-test/internal/xrange"
 	"go.einride.tech/aip/fieldbehavior"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/protobuf/reflect/protopath"
diff --git a/main.go b/main.go
index d4a4b52..6e741dd 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/einride/protoc-gen-go-aiptest/internal/plugin"
+	"github.com/einride/protoc-gen-go-aip-test/internal/plugin"
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
diff --git a/proto/gen/einride/example/freight/v1/freight_service.pb.go b/proto/gen/einride/example/freight/v1/freight_service.pb.go
index c6aecf2..26842b9 100644
--- a/proto/gen/einride/example/freight/v1/freight_service.pb.go
+++ b/proto/gen/einride/example/freight/v1/freight_service.pb.go
@@ -1063,17 +1063,17 @@ var file_einride_example_freight_v1_freight_service_proto_rawDesc = []byte{
 	0x70, 0x65, 0x72, 0x73, 0x2f, 0x2a, 0x2f, 0x73, 0x69, 0x74, 0x65, 0x73, 0x2f, 0x2a, 0x7d, 0x1a,
 	0x1f, 0xca, 0x41, 0x1c, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x65, 0x78, 0x61, 0x6d,
 	0x70, 0x6c, 0x65, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68,
-	0x42, 0x98, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
+	0x42, 0x99, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
 	0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68,
 	0x74, 0x2e, 0x76, 0x31, 0x42, 0x13, 0x46, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74,
+	0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5f, 0x67, 0x69, 0x74,
 	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x61, 0x69,
-	0x70, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f,
-	0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f,
-	0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x70, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e,
+	0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+	0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d,
+	0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/gen/einride/example/freight/v1/resource_references.pb.go b/proto/gen/einride/example/freight/v1/resource_references.pb.go
index 32de469..15739c2 100644
--- a/proto/gen/einride/example/freight/v1/resource_references.pb.go
+++ b/proto/gen/einride/example/freight/v1/resource_references.pb.go
@@ -29,25 +29,25 @@ var file_einride_example_freight_v1_resource_references_proto_rawDesc = []byte{
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1a, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e,
 	0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e,
 	0x76, 0x31, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x90, 0x02,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x91, 0x02,
 	0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65,
 	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76,
 	0x31, 0x42, 0x18, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5e, 0x67,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5f, 0x67,
 	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
 	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d,
-	0x61, 0x69, 0x70, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65,
-	0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0xea, 0x41, 0x70,
-	0x0a, 0x2b, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x42,
-	0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x62,
-	0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2f, 0x7b, 0x62,
-	0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x7d, 0x2a,
-	0x0f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73,
-	0x32, 0x0e, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x69, 0x70, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,
+	0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78,
+	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0xea, 0x41,
+	0x70, 0x0a, 0x2b, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f,
+	0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20,
+	0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2f, 0x7b,
+	0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x7d,
+	0x2a, 0x0f, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x73, 0x32, 0x0e, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var file_einride_example_freight_v1_resource_references_proto_goTypes = []interface{}{}
diff --git a/proto/gen/einride/example/freight/v1/shipper.pb.go b/proto/gen/einride/example/freight/v1/shipper.pb.go
index a30a14d..f788338 100644
--- a/proto/gen/einride/example/freight/v1/shipper.pb.go
+++ b/proto/gen/einride/example/freight/v1/shipper.pb.go
@@ -161,16 +161,17 @@ var file_einride_example_freight_v1_shipper_proto_rawDesc = []byte{
 	0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x12, 0x12, 0x73,
 	0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x73, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72,
 	0x7d, 0x2a, 0x08, 0x73, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x73, 0x32, 0x07, 0x73, 0x68, 0x69,
-	0x70, 0x70, 0x65, 0x72, 0x42, 0x91, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69,
+	0x70, 0x70, 0x65, 0x72, 0x42, 0x92, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69,
 	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72,
 	0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
 	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x61, 0x69, 0x70, 0x74, 0x65,
-	0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e,
-	0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66,
-	0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2d, 0x61, 0x69, 0x70, 0x2d, 0x74,
+	0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69,
+	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+	0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/proto/gen/einride/example/freight/v1/site.pb.go b/proto/gen/einride/example/freight/v1/site.pb.go
index a4afd2f..b9ae3a4 100644
--- a/proto/gen/einride/example/freight/v1/site.pb.go
+++ b/proto/gen/einride/example/freight/v1/site.pb.go
@@ -230,16 +230,16 @@ var file_einride_example_freight_v1_site_proto_rawDesc = []byte{
 	0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63,
 	0x68, 0x2f, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
 	0x52, 0x0e, 0x62, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x42, 0x8e, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
+	0x42, 0x8f, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
 	0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68,
 	0x74, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x53, 0x69, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x69,
+	0x01, 0x5a, 0x5f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x69,
 	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
-	0x2d, 0x67, 0x6f, 0x2d, 0x61, 0x69, 0x70, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78,
-	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31,
-	0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2d, 0x67, 0x6f, 0x2d, 0x61, 0x69, 0x70, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65,
+	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76,
+	0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/gen/einride/example/freight/v1/testing/freight_service.go b/proto/gen/einride/example/freight/v1/testing/freight_service.go
index e649fe5..9707dce 100644
--- a/proto/gen/einride/example/freight/v1/testing/freight_service.go
+++ b/proto/gen/einride/example/freight/v1/testing/freight_service.go
@@ -1,10 +1,10 @@
-// Code generated by protoc-gen-go-aiptest. DO NOT EDIT.
+// Code generated by protoc-gen-go-aip-test. DO NOT EDIT.
 
 package examplefreightv1test
 
 import (
 	context "context"
-	v1 "github.com/einride/protoc-gen-go-aiptest/proto/gen/einride/example/freight/v1"
+	v1 "github.com/einride/protoc-gen-go-aip-test/proto/gen/einride/example/freight/v1"
 	cmpopts "github.com/google/go-cmp/cmp/cmpopts"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
diff --git a/proto/src/einride/example/freight/v1/freight_service.proto b/proto/src/einride/example/freight/v1/freight_service.proto
index 3818258..cd7b154 100644
--- a/proto/src/einride/example/freight/v1/freight_service.proto
+++ b/proto/src/einride/example/freight/v1/freight_service.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "github.com/einride/protoc-gen-go-aiptest/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "github.com/einride/protoc-gen-go-aip-test/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "FreightServiceProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/proto/src/einride/example/freight/v1/resource_references.proto b/proto/src/einride/example/freight/v1/resource_references.proto
index 784b6e5..c2a5b2c 100644
--- a/proto/src/einride/example/freight/v1/resource_references.proto
+++ b/proto/src/einride/example/freight/v1/resource_references.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "github.com/einride/protoc-gen-go-aiptest/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "github.com/einride/protoc-gen-go-aip-test/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ResourceDefinitionsProto";
 option java_package = "tech.einride.example.freight.v1";
@@ -15,4 +15,3 @@ option (google.api.resource_definition) = {
   singular: "billingAccount"
   plural: "billingAccounts"
 };
-
diff --git a/proto/src/einride/example/freight/v1/shipper.proto b/proto/src/einride/example/freight/v1/shipper.proto
index 401117e..49d15ed 100644
--- a/proto/src/einride/example/freight/v1/shipper.proto
+++ b/proto/src/einride/example/freight/v1/shipper.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "github.com/einride/protoc-gen-go-aiptest/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "github.com/einride/protoc-gen-go-aip-test/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ShipperProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/proto/src/einride/example/freight/v1/site.proto b/proto/src/einride/example/freight/v1/site.proto
index 48f6767..4c53da1 100644
--- a/proto/src/einride/example/freight/v1/site.proto
+++ b/proto/src/einride/example/freight/v1/site.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "github.com/einride/protoc-gen-go-aiptest/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "github.com/einride/protoc-gen-go-aip-test/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "SiteProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/tools/protoc-gen-go-grpc/rules.mk b/tools/protoc-gen-go-grpc/rules.mk
index 71021b7..10748d2 100644
--- a/tools/protoc-gen-go-grpc/rules.mk
+++ b/tools/protoc-gen-go-grpc/rules.mk
@@ -1,5 +1,5 @@
 grpc_go_cwd := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-protoc_gen_go_grpc := $(grpc_go_cwd)/bin/protoc-gen-go_grpc
+protoc_gen_go_grpc := $(grpc_go_cwd)/bin/protoc-gen-go-grpc
 export PATH := $(dir $(protoc_gen_go_grpc)):$(PATH)
 
 $(protoc_gen_go_grpc): $(grpc_go_cwd)/../../go.mod