diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index cf30ec2c3c..ff3f78bfc0 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
 github:
 - oapi-codegen
 - jamietanna
-tidelift: go/github.com/oapi-codegen/oapi-codegen/v2
+tidelift: go/github.com/northvolt/oapi-codegen/v2
 open_collective: oapi-codegen
diff --git a/README.md b/README.md
index b49d162f37..1cca854aaf 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ With `oapi-codegen`, there are a few [Key Design Decisions](#key-design-decision
 As announced in [May 2024](https://github.com/oapi-codegen/oapi-codegen/discussions/1605),
 we have moved the project from the deepmap organization to our own organization, and you will need to update your
 import paths to pull updates past this point. You need to do a recursive search/replace from
-`github.com/deepmap/oapi-codegen/v2` to `github.com/oapi-codegen/oapi-codegen/v2`.
+`github.com/deepmap/oapi-codegen/v2` to `github.com/northvolt/oapi-codegen/v2`.
 
 > [!IMPORTANT]
 > `oapi-codegen` moved to its new home with the version tag `v2.3.0`.
@@ -37,7 +37,7 @@ If you are using `v2.3.0` or above, please install like so, using the new module
 
 ```sh
 # for the binary install
-go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest
+go install github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen@latest
 ```
 
 ## Install
@@ -53,20 +53,20 @@ This would give you a `tools/tools.go`:
 package main
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
 ```
 
 Then, each invocation of `oapi-codegen` would be used like so:
 
 ```go
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
 ```
 
 Alternatively, you can install it as a binary with:
 
 ```sh
-$ go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest
+$ go install github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen@latest
 $ oapi-codegen -version
 ```
 
@@ -90,9 +90,9 @@ To do so, you can run:
 
 ```sh
 # pin to the latest version on the default branch
-$ go get github.com/oapi-codegen/oapi-codegen/v2@main
+$ go get github.com/northvolt/oapi-codegen/v2@main
 # alternatively, to a commit hash i.e. https://github.com/oapi-codegen/oapi-codegen/commit/71e916c59688a6379b5774dfe5904ec222b9a537
-$ go get github.com/oapi-codegen/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537
+$ go get github.com/northvolt/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537
 ```
 
 This will then make a change such as:
@@ -103,15 +103,15 @@ index 44f29a4..436a780 100644
 --- go.mod
 +++ go.mod
 @@ -2,21 +2,20 @@
--require github.com/oapi-codegen/oapi-codegen/v2 v2.1.0
-+require github.com/oapi-codegen/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16
+-require github.com/northvolt/oapi-codegen/v2 v2.1.0
++require github.com/northvolt/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16
 ```
 
 ## Usage
 
 `oapi-codegen` is largely configured using a YAML configuration file, to simplify the number of flags that users need to remember, and to make reading the `go:generate` command less daunting.
 
-For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#Configuration).
+For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/northvolt/oapi-codegen/v2/pkg/codegen#Configuration).
 
 We also have [a JSON Schema](configuration-schema.json) that can be used by IDEs/editors with the Language Server Protocol (LSP) to perform intelligent suggestions, i.e.:
 
@@ -125,7 +125,7 @@ package: api
 
 Although we strive to retain backwards compatibility - as a project that's using a stable API per SemVer - there are sometimes opportunities we must take to fix a bug that could cause a breaking change for [people relying upon the behaviour](https://xkcd.com/1172/).
 
-In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour.
+In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/northvolt/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour.
 
 ## Features
 
@@ -704,7 +704,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/stdhttp/api"
 )
 
 func main() {
@@ -841,7 +841,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/chi/api"
 	"github.com/go-chi/chi/v5"
 )
 
@@ -968,7 +968,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
 	"github.com/gorilla/mux"
 )
 
@@ -1099,7 +1099,7 @@ Now we've got our implementation, we can then write the following code to wire i
 import (
 	"log"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/echo/api"
 	"github.com/labstack/echo/v4"
 )
 
@@ -1216,7 +1216,7 @@ Now we've got our implementation, we can then write the following code to wire i
 import (
 	"log"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/fiber/api"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -1331,7 +1331,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/gin/api"
 	"github.com/gin-gonic/gin"
 )
 
@@ -1455,7 +1455,7 @@ Now we've got our implementation, we can then write the following code to wire i
 import (
 	"log"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/iris/api"
 	"github.com/kataras/iris/v12"
 )
 
@@ -1590,7 +1590,7 @@ And a `generate.go`:
 ```go
 package client
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
 ```
 
 This would then generate:
@@ -1666,7 +1666,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/client"
+	"github.com/northvolt/oapi-codegen/v2/examples/client"
 )
 
 func TestClient_canCall() {
@@ -1789,7 +1789,7 @@ And a `generate.go`:
 ```go
 package onlymodels
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
 ```
 
 This would then generate:
@@ -1908,8 +1908,8 @@ So how do we get `oapi-codegen` to generate our code?
 To get `oapi-codegen`'s single-package support working, we need multiple calls to `oapi-codegen`, one call per OpenAPI spec file:
 
 ```sh
-$ go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg-api.yaml ../admin/api.yaml
-$ go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg-user.yaml ../common/api.yaml
+$ go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg-api.yaml ../admin/api.yaml
+$ go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg-user.yaml ../common/api.yaml
 ```
 
 This therefore means that we need multiple configuration files, such as `cfg-api.yaml`:
@@ -1995,7 +1995,7 @@ output-options:
   skip-prune: true
 import-mapping:
   # for a given file/URL that is $ref'd, point `oapi-codegen` to the Go package that this spec is generated into, to perform Go package imports
-  ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common
+  ../common/api.yaml: github.com/northvolt/oapi-codegen/v2/examples/import-mapping/common
 ```
 
 This will then generate the following code:
@@ -2005,7 +2005,7 @@ package admin
 
 import (
 	// ...
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/examples/import-mapping/common"
 )
 
 // User defines model for User.
@@ -3120,7 +3120,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
+	"github.com/northvolt/oapi-codegen/v2/pkg/securityprovider"
 )
 
 func main() {
@@ -3142,7 +3142,7 @@ func main() {
 }
 ```
 
-Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too.
+Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/northvolt/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too.
 
 ## Custom code generation
 
@@ -3193,7 +3193,7 @@ output-options:
     # Alternatively using raw.githubusercontent.com with a hash
     client-with-responses.tmpl: https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/ad5eada4f3ccc28a88477cef62ea21c17fc8aa01/pkg/codegen/templates/client-with-responses.tmpl
     # Alternatively using raw.githubusercontent.com with a tag
-    client-with-responses.tmpl: https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/v2.1.0/pkg/codegen/templates/client-with-responses.tmpl
+    client-with-responses.tmpl: https://raw.githubusercontent.com/northvolt/oapi-codegen/v2.1.0/pkg/codegen/templates/client-with-responses.tmpl
     # Alternatively using raw.githubusercontent.com with a branch
     client-with-responses.tmpl: https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/master/pkg/codegen/templates/client-with-responses.tmpl
 ```
@@ -4100,7 +4100,7 @@ output-options:
   exclude-schemas: []
 ```
 
-Check [the docs](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage.
+Check [the docs](https://pkg.go.dev/github.com/northvolt/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage.
 
 ### Should I commit the generated code?
 
diff --git a/cmd/oapi-codegen/oapi-codegen.go b/cmd/oapi-codegen/oapi-codegen.go
index 2d05cff92c..af012ef8a2 100644
--- a/cmd/oapi-codegen/oapi-codegen.go
+++ b/cmd/oapi-codegen/oapi-codegen.go
@@ -25,8 +25,8 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 func errExit(format string, args ...interface{}) {
diff --git a/cmd/oapi-codegen/oapi-codegen_test.go b/cmd/oapi-codegen/oapi-codegen_test.go
index 9d9f06c204..5643349c00 100644
--- a/cmd/oapi-codegen/oapi-codegen_test.go
+++ b/cmd/oapi-codegen/oapi-codegen_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 func TestLoader(t *testing.T) {
diff --git a/examples/anyof-allof-oneof/anyofallofoneof.gen.go b/examples/anyof-allof-oneof/anyofallofoneof.gen.go
index 99b8616833..bcd2713b41 100644
--- a/examples/anyof-allof-oneof/anyofallofoneof.gen.go
+++ b/examples/anyof-allof-oneof/anyofallofoneof.gen.go
@@ -1,6 +1,6 @@
 // Package anyofallofoneof provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package anyofallofoneof
 
 import (
diff --git a/examples/anyof-allof-oneof/generate.go b/examples/anyof-allof-oneof/generate.go
index 9e993e2b9f..5562d50349 100644
--- a/examples/anyof-allof-oneof/generate.go
+++ b/examples/anyof-allof-oneof/generate.go
@@ -1,3 +1,3 @@
 package anyofallofoneof
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/authenticated-api/echo/api/api.gen.go b/examples/authenticated-api/echo/api/api.gen.go
index 383ab5dc25..da22913a72 100644
--- a/examples/authenticated-api/echo/api/api.gen.go
+++ b/examples/authenticated-api/echo/api/api.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/authenticated-api/echo/api/doc.go b/examples/authenticated-api/echo/api/doc.go
index e6d8f45d97..975e8dffdc 100644
--- a/examples/authenticated-api/echo/api/doc.go
+++ b/examples/authenticated-api/echo/api/doc.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
diff --git a/examples/authenticated-api/echo/main.go b/examples/authenticated-api/echo/main.go
index 905f8d8aeb..e0e72da4e3 100644
--- a/examples/authenticated-api/echo/main.go
+++ b/examples/authenticated-api/echo/main.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/server"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/echo/server"
 )
 
 func main() {
diff --git a/examples/authenticated-api/echo/server/fake_jws.go b/examples/authenticated-api/echo/server/fake_jws.go
index 6eb3067d86..1b46c62431 100644
--- a/examples/authenticated-api/echo/server/fake_jws.go
+++ b/examples/authenticated-api/echo/server/fake_jws.go
@@ -8,7 +8,7 @@ import (
 	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/lestrrat-go/jwx/jws"
 	"github.com/lestrrat-go/jwx/jwt"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile"
+	"github.com/northvolt/oapi-codegen/v2/pkg/ecdsafile"
 )
 
 // PrivateKey is an ECDSA private key which was generated with the following
diff --git a/examples/authenticated-api/echo/server/server.go b/examples/authenticated-api/echo/server/server.go
index 5346b77e28..19652a4582 100644
--- a/examples/authenticated-api/echo/server/server.go
+++ b/examples/authenticated-api/echo/server/server.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3filter"
 	"github.com/labstack/echo/v4"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/echo/api"
 	middleware "github.com/oapi-codegen/echo-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api"
 )
 
 type server struct {
diff --git a/examples/authenticated-api/echo/server/server_test.go b/examples/authenticated-api/echo/server/server_test.go
index 5891c71717..16c342bbea 100644
--- a/examples/authenticated-api/echo/server/server_test.go
+++ b/examples/authenticated-api/echo/server/server_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/labstack/echo/v4"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/echo/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/authenticated-api/stdhttp/api/api.gen.go b/examples/authenticated-api/stdhttp/api/api.gen.go
index 91ced48c3d..dbf8efdd11 100644
--- a/examples/authenticated-api/stdhttp/api/api.gen.go
+++ b/examples/authenticated-api/stdhttp/api/api.gen.go
@@ -2,7 +2,7 @@
 
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/authenticated-api/stdhttp/api/doc.go b/examples/authenticated-api/stdhttp/api/doc.go
index e6d8f45d97..975e8dffdc 100644
--- a/examples/authenticated-api/stdhttp/api/doc.go
+++ b/examples/authenticated-api/stdhttp/api/doc.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
diff --git a/examples/authenticated-api/stdhttp/go.mod b/examples/authenticated-api/stdhttp/go.mod
index 2df22d9bdc..815d11a664 100644
--- a/examples/authenticated-api/stdhttp/go.mod
+++ b/examples/authenticated-api/stdhttp/go.mod
@@ -1,14 +1,14 @@
-module github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp
+module github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/stdhttp
 
 go 1.22
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../
+replace github.com/northvolt/oapi-codegen/v2 => ../../../
 
 require (
 	github.com/getkin/kin-openapi v0.127.0
 	github.com/lestrrat-go/jwx v1.2.29
 	github.com/oapi-codegen/nethttp-middleware v1.0.2
-	github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
 	github.com/oapi-codegen/testutil v1.1.0
 	github.com/stretchr/testify v1.9.0
 )
diff --git a/examples/authenticated-api/stdhttp/main.go b/examples/authenticated-api/stdhttp/main.go
index 73d330aac4..e8dfa4ca5d 100644
--- a/examples/authenticated-api/stdhttp/main.go
+++ b/examples/authenticated-api/stdhttp/main.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/server"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/stdhttp/server"
 )
 
 func main() {
diff --git a/examples/authenticated-api/stdhttp/server/fake_jws.go b/examples/authenticated-api/stdhttp/server/fake_jws.go
index 6eb3067d86..1b46c62431 100644
--- a/examples/authenticated-api/stdhttp/server/fake_jws.go
+++ b/examples/authenticated-api/stdhttp/server/fake_jws.go
@@ -8,7 +8,7 @@ import (
 	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/lestrrat-go/jwx/jws"
 	"github.com/lestrrat-go/jwx/jwt"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile"
+	"github.com/northvolt/oapi-codegen/v2/pkg/ecdsafile"
 )
 
 // PrivateKey is an ECDSA private key which was generated with the following
diff --git a/examples/authenticated-api/stdhttp/server/server.go b/examples/authenticated-api/stdhttp/server/server.go
index ddcabaa737..f26e9f39db 100644
--- a/examples/authenticated-api/stdhttp/server/server.go
+++ b/examples/authenticated-api/stdhttp/server/server.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 
 	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
 )
 
 type server struct {
diff --git a/examples/authenticated-api/stdhttp/server/server_test.go b/examples/authenticated-api/stdhttp/server/server_test.go
index cfada646da..27048fe2c7 100644
--- a/examples/authenticated-api/stdhttp/server/server_test.go
+++ b/examples/authenticated-api/stdhttp/server/server_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/authenticated-api/stdhttp/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/authenticated-api/stdhttp/tools/tools.go b/examples/authenticated-api/stdhttp/tools/tools.go
index 8615cb4c57..1a90dde50c 100644
--- a/examples/authenticated-api/stdhttp/tools/tools.go
+++ b/examples/authenticated-api/stdhttp/tools/tools.go
@@ -4,5 +4,5 @@
 package tools
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
diff --git a/examples/client/client.gen.go b/examples/client/client.gen.go
index 8ef6b78564..c1ddaefae3 100644
--- a/examples/client/client.gen.go
+++ b/examples/client/client.gen.go
@@ -1,6 +1,6 @@
 // Package client provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package client
 
 import (
diff --git a/examples/client/generate.go b/examples/client/generate.go
index e9c9a42f86..4024199086 100644
--- a/examples/client/generate.go
+++ b/examples/client/generate.go
@@ -1,3 +1,3 @@
 package client
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/custom-client-type/custom-client-type.gen.go b/examples/custom-client-type/custom-client-type.gen.go
index 6dd2ef0195..969dc5644a 100644
--- a/examples/custom-client-type/custom-client-type.gen.go
+++ b/examples/custom-client-type/custom-client-type.gen.go
@@ -1,6 +1,6 @@
 // Package customclienttype provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package customclienttype
 
 import (
diff --git a/examples/custom-client-type/doc.go b/examples/custom-client-type/doc.go
index 89172d392e..a662f28a8a 100644
--- a/examples/custom-client-type/doc.go
+++ b/examples/custom-client-type/doc.go
@@ -3,4 +3,4 @@ package customclienttype
 // This is an example of how to add a prefix to the name of the generated Client struct
 // See https://github.com/oapi-codegen/oapi-codegen/issues/785 for why this might be necessary
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xdeprecatedreason/gen.go b/examples/extensions/xdeprecatedreason/gen.go
index aa36e0387e..46aeb7e248 100644
--- a/examples/extensions/xdeprecatedreason/gen.go
+++ b/examples/extensions/xdeprecatedreason/gen.go
@@ -1,6 +1,6 @@
 // Package xdeprecatedreason provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xdeprecatedreason
 
 // Client defines model for Client.
diff --git a/examples/extensions/xdeprecatedreason/generate.go b/examples/extensions/xdeprecatedreason/generate.go
index 97a610ff37..d775d3c6e8 100644
--- a/examples/extensions/xdeprecatedreason/generate.go
+++ b/examples/extensions/xdeprecatedreason/generate.go
@@ -1,3 +1,3 @@
 package xdeprecatedreason
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xenumnames/gen.go b/examples/extensions/xenumnames/gen.go
index 73ebfa656c..e1b5d3b208 100644
--- a/examples/extensions/xenumnames/gen.go
+++ b/examples/extensions/xenumnames/gen.go
@@ -1,6 +1,6 @@
 // Package xenumnames provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xenumnames
 
 // Defines values for ClientType.
diff --git a/examples/extensions/xenumnames/generate.go b/examples/extensions/xenumnames/generate.go
index 599d6f3f91..457b8b565b 100644
--- a/examples/extensions/xenumnames/generate.go
+++ b/examples/extensions/xenumnames/generate.go
@@ -1,3 +1,3 @@
 package xenumnames
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xgojsonignore/gen.go b/examples/extensions/xgojsonignore/gen.go
index 17c21373da..5298f165a9 100644
--- a/examples/extensions/xgojsonignore/gen.go
+++ b/examples/extensions/xgojsonignore/gen.go
@@ -1,6 +1,6 @@
 // Package xgojsonignore provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xgojsonignore
 
 // Client defines model for Client.
diff --git a/examples/extensions/xgojsonignore/generate.go b/examples/extensions/xgojsonignore/generate.go
index 0d8488e438..98c389d94e 100644
--- a/examples/extensions/xgojsonignore/generate.go
+++ b/examples/extensions/xgojsonignore/generate.go
@@ -1,3 +1,3 @@
 package xgojsonignore
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xgoname/gen.go b/examples/extensions/xgoname/gen.go
index c7831379a1..7311589e12 100644
--- a/examples/extensions/xgoname/gen.go
+++ b/examples/extensions/xgoname/gen.go
@@ -1,6 +1,6 @@
 // Package xgoname provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xgoname
 
 // Client defines model for Client.
diff --git a/examples/extensions/xgoname/generate.go b/examples/extensions/xgoname/generate.go
index 5462114199..34fdaf829b 100644
--- a/examples/extensions/xgoname/generate.go
+++ b/examples/extensions/xgoname/generate.go
@@ -1,3 +1,3 @@
 package xgoname
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xgotype/gen.go b/examples/extensions/xgotype/gen.go
index 376c1fdbff..7bf02b6cf2 100644
--- a/examples/extensions/xgotype/gen.go
+++ b/examples/extensions/xgotype/gen.go
@@ -1,6 +1,6 @@
 // Package xgotype provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xgotype
 
 import (
diff --git a/examples/extensions/xgotype/generate.go b/examples/extensions/xgotype/generate.go
index fc28c53de8..50bf29540f 100644
--- a/examples/extensions/xgotype/generate.go
+++ b/examples/extensions/xgotype/generate.go
@@ -1,3 +1,3 @@
 package xgotype
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xgotypename/gen.go b/examples/extensions/xgotypename/gen.go
index cc0c9c2bf5..bdd69fbc5e 100644
--- a/examples/extensions/xgotypename/gen.go
+++ b/examples/extensions/xgotypename/gen.go
@@ -1,6 +1,6 @@
 // Package xgotypename provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xgotypename
 
 // Client defines model for Client.
diff --git a/examples/extensions/xgotypename/generate.go b/examples/extensions/xgotypename/generate.go
index 787661180b..e92edd533f 100644
--- a/examples/extensions/xgotypename/generate.go
+++ b/examples/extensions/xgotypename/generate.go
@@ -1,3 +1,3 @@
 package xgotypename
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xgotypeskipoptionalpointer/gen.go b/examples/extensions/xgotypeskipoptionalpointer/gen.go
index ddb1df8436..703f9c0d61 100644
--- a/examples/extensions/xgotypeskipoptionalpointer/gen.go
+++ b/examples/extensions/xgotypeskipoptionalpointer/gen.go
@@ -1,6 +1,6 @@
 // Package xgotypeskipoptionalpointer provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xgotypeskipoptionalpointer
 
 // Client defines model for Client.
diff --git a/examples/extensions/xgotypeskipoptionalpointer/generate.go b/examples/extensions/xgotypeskipoptionalpointer/generate.go
index 582ec97fdd..34535ed630 100644
--- a/examples/extensions/xgotypeskipoptionalpointer/generate.go
+++ b/examples/extensions/xgotypeskipoptionalpointer/generate.go
@@ -1,3 +1,3 @@
 package xgotypeskipoptionalpointer
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xoapicodegenextratags/gen.go b/examples/extensions/xoapicodegenextratags/gen.go
index 25f950e3d4..dcba8d805d 100644
--- a/examples/extensions/xoapicodegenextratags/gen.go
+++ b/examples/extensions/xoapicodegenextratags/gen.go
@@ -1,6 +1,6 @@
 // Package xoapicodegenextratags provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xoapicodegenextratags
 
 // Client defines model for Client.
diff --git a/examples/extensions/xoapicodegenextratags/generate.go b/examples/extensions/xoapicodegenextratags/generate.go
index 6906128b00..cdc02d2f20 100644
--- a/examples/extensions/xoapicodegenextratags/generate.go
+++ b/examples/extensions/xoapicodegenextratags/generate.go
@@ -1,3 +1,3 @@
 package xoapicodegenextratags
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xoapicodegenonlyhonourgoname/gen.go b/examples/extensions/xoapicodegenonlyhonourgoname/gen.go
index 71e3cca4b5..e5911772e9 100644
--- a/examples/extensions/xoapicodegenonlyhonourgoname/gen.go
+++ b/examples/extensions/xoapicodegenonlyhonourgoname/gen.go
@@ -1,6 +1,6 @@
 // Package xoapicodegenonlyhonourgoname provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xoapicodegenonlyhonourgoname
 
 // TypeWithUnexportedField A struct will be output where one of the fields is not exported
diff --git a/examples/extensions/xoapicodegenonlyhonourgoname/generate.go b/examples/extensions/xoapicodegenonlyhonourgoname/generate.go
index 938d489126..8f0fa1acda 100644
--- a/examples/extensions/xoapicodegenonlyhonourgoname/generate.go
+++ b/examples/extensions/xoapicodegenonlyhonourgoname/generate.go
@@ -1,3 +1,3 @@
 package xoapicodegenonlyhonourgoname
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xomitempty/gen.go b/examples/extensions/xomitempty/gen.go
index a4a06f97e6..0a6afd8487 100644
--- a/examples/extensions/xomitempty/gen.go
+++ b/examples/extensions/xomitempty/gen.go
@@ -1,6 +1,6 @@
 // Package xomitempty provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xomitempty
 
 // Client defines model for Client.
diff --git a/examples/extensions/xomitempty/generate.go b/examples/extensions/xomitempty/generate.go
index c6c48c4fed..d2f6c4ca8a 100644
--- a/examples/extensions/xomitempty/generate.go
+++ b/examples/extensions/xomitempty/generate.go
@@ -1,3 +1,3 @@
 package xomitempty
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/extensions/xorder/gen.go b/examples/extensions/xorder/gen.go
index bb5841d564..8fa116bf50 100644
--- a/examples/extensions/xorder/gen.go
+++ b/examples/extensions/xorder/gen.go
@@ -1,6 +1,6 @@
 // Package xorder provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xorder
 
 // Client defines model for Client.
diff --git a/examples/extensions/xorder/generate.go b/examples/extensions/xorder/generate.go
index 9b9d46563e..b35df7623e 100644
--- a/examples/extensions/xorder/generate.go
+++ b/examples/extensions/xorder/generate.go
@@ -1,3 +1,3 @@
 package xorder
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/go.mod b/examples/go.mod
index 2066e1225f..8ea32fdd49 100644
--- a/examples/go.mod
+++ b/examples/go.mod
@@ -1,8 +1,8 @@
-module github.com/oapi-codegen/oapi-codegen/v2/examples
+module github.com/northvolt/oapi-codegen/v2/examples
 
 go 1.21.13
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../
+replace github.com/northvolt/oapi-codegen/v2 => ../
 
 require (
 	github.com/getkin/kin-openapi v0.127.0
@@ -19,7 +19,7 @@ require (
 	github.com/oapi-codegen/gin-middleware v1.0.2
 	github.com/oapi-codegen/iris-middleware v1.0.5
 	github.com/oapi-codegen/nethttp-middleware v1.0.2
-	github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
 	github.com/oapi-codegen/runtime v1.1.0
 	github.com/oapi-codegen/testutil v1.0.0
 	github.com/stretchr/testify v1.9.0
diff --git a/examples/import-mapping/multiplepackages/admin/cfg.yaml b/examples/import-mapping/multiplepackages/admin/cfg.yaml
index 65ca92f1b7..5dbf9a726c 100644
--- a/examples/import-mapping/multiplepackages/admin/cfg.yaml
+++ b/examples/import-mapping/multiplepackages/admin/cfg.yaml
@@ -8,4 +8,4 @@ output-options:
   # to make sure that all types are generated
   skip-prune: true
 import-mapping:
-  ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/multiplepackages/common
+  ../common/api.yaml: github.com/northvolt/oapi-codegen/v2/examples/import-mapping/multiplepackages/common
diff --git a/examples/import-mapping/multiplepackages/admin/generate.go b/examples/import-mapping/multiplepackages/admin/generate.go
index 304d122d22..b5e69dacfb 100644
--- a/examples/import-mapping/multiplepackages/admin/generate.go
+++ b/examples/import-mapping/multiplepackages/admin/generate.go
@@ -1,3 +1,3 @@
 package admin
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../admin/api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../admin/api.yaml
diff --git a/examples/import-mapping/multiplepackages/admin/server.gen.go b/examples/import-mapping/multiplepackages/admin/server.gen.go
index 36e33e4c4c..f1cb4bdbb9 100644
--- a/examples/import-mapping/multiplepackages/admin/server.gen.go
+++ b/examples/import-mapping/multiplepackages/admin/server.gen.go
@@ -1,6 +1,6 @@
 // Package admin provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package admin
 
 import (
diff --git a/examples/import-mapping/multiplepackages/common/generate.go b/examples/import-mapping/multiplepackages/common/generate.go
index 2e515e9342..6e99c5f2f4 100644
--- a/examples/import-mapping/multiplepackages/common/generate.go
+++ b/examples/import-mapping/multiplepackages/common/generate.go
@@ -1,3 +1,3 @@
 package common
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../common/api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../common/api.yaml
diff --git a/examples/import-mapping/multiplepackages/common/types.gen.go b/examples/import-mapping/multiplepackages/common/types.gen.go
index 178106064e..4c627127be 100644
--- a/examples/import-mapping/multiplepackages/common/types.gen.go
+++ b/examples/import-mapping/multiplepackages/common/types.gen.go
@@ -1,6 +1,6 @@
 // Package common provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package common
 
 // User defines model for User.
diff --git a/examples/import-mapping/samepackage/generate.go b/examples/import-mapping/samepackage/generate.go
index cb4ceae468..047f53128e 100644
--- a/examples/import-mapping/samepackage/generate.go
+++ b/examples/import-mapping/samepackage/generate.go
@@ -1,4 +1,4 @@
 package samepackage
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg-api.yaml ../admin/api.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg-user.yaml ../common/api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg-api.yaml ../admin/api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg-user.yaml ../common/api.yaml
diff --git a/examples/import-mapping/samepackage/server.gen.go b/examples/import-mapping/samepackage/server.gen.go
index bd9445262b..826f5b2601 100644
--- a/examples/import-mapping/samepackage/server.gen.go
+++ b/examples/import-mapping/samepackage/server.gen.go
@@ -1,6 +1,6 @@
 // Package samepackage provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package samepackage
 
 import (
diff --git a/examples/import-mapping/samepackage/user.gen.go b/examples/import-mapping/samepackage/user.gen.go
index 46ab646a4f..1142916b3f 100644
--- a/examples/import-mapping/samepackage/user.gen.go
+++ b/examples/import-mapping/samepackage/user.gen.go
@@ -1,6 +1,6 @@
 // Package samepackage provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package samepackage
 
 // User defines model for User.
diff --git a/examples/minimal-server/chi/api/generate.go b/examples/minimal-server/chi/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/chi/api/generate.go
+++ b/examples/minimal-server/chi/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/chi/api/ping.gen.go b/examples/minimal-server/chi/api/ping.gen.go
index a2f368005a..fb09377f4f 100644
--- a/examples/minimal-server/chi/api/ping.gen.go
+++ b/examples/minimal-server/chi/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/chi/main.go b/examples/minimal-server/chi/main.go
index 56e0a0515e..00d3eeb1d2 100644
--- a/examples/minimal-server/chi/main.go
+++ b/examples/minimal-server/chi/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/chi/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/echo/api/generate.go b/examples/minimal-server/echo/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/echo/api/generate.go
+++ b/examples/minimal-server/echo/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/echo/api/ping.gen.go b/examples/minimal-server/echo/api/ping.gen.go
index bd78f8f2ad..d6529040dc 100644
--- a/examples/minimal-server/echo/api/ping.gen.go
+++ b/examples/minimal-server/echo/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/echo/main.go b/examples/minimal-server/echo/main.go
index ae53667f3e..b1b44b0183 100644
--- a/examples/minimal-server/echo/main.go
+++ b/examples/minimal-server/echo/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/labstack/echo/v4"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/echo/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/fiber/api/generate.go b/examples/minimal-server/fiber/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/fiber/api/generate.go
+++ b/examples/minimal-server/fiber/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/fiber/api/ping.gen.go b/examples/minimal-server/fiber/api/ping.gen.go
index a21e6fa956..5b701c6e20 100644
--- a/examples/minimal-server/fiber/api/ping.gen.go
+++ b/examples/minimal-server/fiber/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/fiber/main.go b/examples/minimal-server/fiber/main.go
index 88504af7be..d9988f7656 100644
--- a/examples/minimal-server/fiber/main.go
+++ b/examples/minimal-server/fiber/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/fiber/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/gin/api/generate.go b/examples/minimal-server/gin/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/gin/api/generate.go
+++ b/examples/minimal-server/gin/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/gin/api/ping.gen.go b/examples/minimal-server/gin/api/ping.gen.go
index 8e018d4e89..d105750205 100644
--- a/examples/minimal-server/gin/api/ping.gen.go
+++ b/examples/minimal-server/gin/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/gin/main.go b/examples/minimal-server/gin/main.go
index 365932e313..a6b8c76c33 100644
--- a/examples/minimal-server/gin/main.go
+++ b/examples/minimal-server/gin/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/gin/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/gorillamux/api/generate.go b/examples/minimal-server/gorillamux/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/gorillamux/api/generate.go
+++ b/examples/minimal-server/gorillamux/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/gorillamux/api/ping.gen.go b/examples/minimal-server/gorillamux/api/ping.gen.go
index 9445d02b53..44cc0bdc38 100644
--- a/examples/minimal-server/gorillamux/api/ping.gen.go
+++ b/examples/minimal-server/gorillamux/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/gorillamux/main.go b/examples/minimal-server/gorillamux/main.go
index 5d7dc87f7f..3d67eed7ce 100644
--- a/examples/minimal-server/gorillamux/main.go
+++ b/examples/minimal-server/gorillamux/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/iris/api/generate.go b/examples/minimal-server/iris/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/iris/api/generate.go
+++ b/examples/minimal-server/iris/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/iris/api/ping.gen.go b/examples/minimal-server/iris/api/ping.gen.go
index 144166eba2..c1c465c43b 100644
--- a/examples/minimal-server/iris/api/ping.gen.go
+++ b/examples/minimal-server/iris/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/iris/main.go b/examples/minimal-server/iris/main.go
index a163d6f598..fec0075b73 100644
--- a/examples/minimal-server/iris/main.go
+++ b/examples/minimal-server/iris/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/kataras/iris/v12"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/iris/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/nethttp-compatible/main.go b/examples/minimal-server/nethttp-compatible/main.go
index 784b741cf0..5ffb691ef4 100644
--- a/examples/minimal-server/nethttp-compatible/main.go
+++ b/examples/minimal-server/nethttp-compatible/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/gorillamux/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/stdhttp/api/generate.go b/examples/minimal-server/stdhttp/api/generate.go
index 386f093dc1..ab70e54728 100644
--- a/examples/minimal-server/stdhttp/api/generate.go
+++ b/examples/minimal-server/stdhttp/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml
diff --git a/examples/minimal-server/stdhttp/api/ping.gen.go b/examples/minimal-server/stdhttp/api/ping.gen.go
index 794f8d817f..81433e5dcc 100644
--- a/examples/minimal-server/stdhttp/api/ping.gen.go
+++ b/examples/minimal-server/stdhttp/api/ping.gen.go
@@ -2,7 +2,7 @@
 
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/minimal-server/stdhttp/go.mod b/examples/minimal-server/stdhttp/go.mod
index 41cde25da6..17f985a5f5 100644
--- a/examples/minimal-server/stdhttp/go.mod
+++ b/examples/minimal-server/stdhttp/go.mod
@@ -1,10 +1,10 @@
-module github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp
+module github.com/northvolt/oapi-codegen/v2/examples/minimal-server/stdhttp
 
 go 1.22
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../
+replace github.com/northvolt/oapi-codegen/v2 => ../../../
 
-require github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+require github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
 
 require (
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
diff --git a/examples/minimal-server/stdhttp/main.go b/examples/minimal-server/stdhttp/main.go
index 8ee94ec49f..b9d96dd8ef 100644
--- a/examples/minimal-server/stdhttp/main.go
+++ b/examples/minimal-server/stdhttp/main.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/minimal-server/stdhttp/api"
 )
 
 func main() {
diff --git a/examples/minimal-server/stdhttp/tools/tools.go b/examples/minimal-server/stdhttp/tools/tools.go
index 8615cb4c57..1a90dde50c 100644
--- a/examples/minimal-server/stdhttp/tools/tools.go
+++ b/examples/minimal-server/stdhttp/tools/tools.go
@@ -4,5 +4,5 @@
 package tools
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
diff --git a/examples/no-vcs-version-override/echo/api/api.gen.go b/examples/no-vcs-version-override/echo/api/api.gen.go
index e95391fd13..eb761a17d5 100644
--- a/examples/no-vcs-version-override/echo/api/api.gen.go
+++ b/examples/no-vcs-version-override/echo/api/api.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v123.456.789 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v123.456.789 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/no-vcs-version-override/echo/api/doc.go b/examples/no-vcs-version-override/echo/api/doc.go
index 03f5a0318f..97ecdbfc12 100644
--- a/examples/no-vcs-version-override/echo/api/doc.go
+++ b/examples/no-vcs-version-override/echo/api/doc.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
+//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
diff --git a/examples/only-models/generate.go b/examples/only-models/generate.go
index 91b4957257..56f40d9dff 100644
--- a/examples/only-models/generate.go
+++ b/examples/only-models/generate.go
@@ -1,3 +1,3 @@
 package onlymodels
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/only-models/only-models.gen.go b/examples/only-models/only-models.gen.go
index c8f33c9c8f..a50ba7eff6 100644
--- a/examples/only-models/only-models.gen.go
+++ b/examples/only-models/only-models.gen.go
@@ -1,6 +1,6 @@
 // Package onlymodels provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package onlymodels
 
 // Client defines model for Client.
diff --git a/examples/overlay/api/generate.go b/examples/overlay/api/generate.go
index c025a4570d..557718768f 100644
--- a/examples/overlay/api/generate.go
+++ b/examples/overlay/api/generate.go
@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/examples/overlay/api/ping.gen.go b/examples/overlay/api/ping.gen.go
index d36bdd55b3..dbe7e4bb51 100644
--- a/examples/overlay/api/ping.gen.go
+++ b/examples/overlay/api/ping.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/overlay/main.go b/examples/overlay/main.go
index 34cfb71efd..940a51e27d 100644
--- a/examples/overlay/main.go
+++ b/examples/overlay/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/overlay/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/overlay/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/chi/api/petstore.gen.go b/examples/petstore-expanded/chi/api/petstore.gen.go
index 88b246f37b..3d9f1f623f 100644
--- a/examples/petstore-expanded/chi/api/petstore.gen.go
+++ b/examples/petstore-expanded/chi/api/petstore.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/chi/api/petstore.go b/examples/petstore-expanded/chi/api/petstore.go
index 6ede559ec5..5560860db7 100644
--- a/examples/petstore-expanded/chi/api/petstore.go
+++ b/examples/petstore-expanded/chi/api/petstore.go
@@ -1,4 +1,4 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/chi/petstore.go b/examples/petstore-expanded/chi/petstore.go
index b525fa5763..5210cd97bd 100644
--- a/examples/petstore-expanded/chi/petstore.go
+++ b/examples/petstore-expanded/chi/petstore.go
@@ -13,8 +13,8 @@ import (
 	"os"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/chi/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/chi/petstore_test.go b/examples/petstore-expanded/chi/petstore_test.go
index e9d7662b45..bfd4f54648 100644
--- a/examples/petstore-expanded/chi/petstore_test.go
+++ b/examples/petstore-expanded/chi/petstore_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/chi/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/petstore-expanded/echo/api/models/models.gen.go b/examples/petstore-expanded/echo/api/models/models.gen.go
index 0945e02abb..5fd8b26a00 100644
--- a/examples/petstore-expanded/echo/api/models/models.gen.go
+++ b/examples/petstore-expanded/echo/api/models/models.gen.go
@@ -1,6 +1,6 @@
 // Package models provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package models
 
 // Error defines model for Error.
diff --git a/examples/petstore-expanded/echo/api/petstore-server.gen.go b/examples/petstore-expanded/echo/api/petstore-server.gen.go
index 8767c17a14..49c252cc14 100644
--- a/examples/petstore-expanded/echo/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/echo/api/petstore-server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
@@ -15,7 +15,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
-	. "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
+	. "github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
 	"github.com/oapi-codegen/runtime"
 )
 
diff --git a/examples/petstore-expanded/echo/api/petstore.go b/examples/petstore-expanded/echo/api/petstore.go
index 9934fa9921..84eb07a926 100644
--- a/examples/petstore-expanded/echo/api/petstore.go
+++ b/examples/petstore-expanded/echo/api/petstore.go
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
@@ -23,7 +23,7 @@ import (
 	"sync"
 
 	"github.com/labstack/echo/v4"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
 )
 
 type PetStore struct {
diff --git a/examples/petstore-expanded/echo/api/server.cfg.yaml b/examples/petstore-expanded/echo/api/server.cfg.yaml
index 534f4d8f59..bab1e6860d 100644
--- a/examples/petstore-expanded/echo/api/server.cfg.yaml
+++ b/examples/petstore-expanded/echo/api/server.cfg.yaml
@@ -2,7 +2,7 @@
 package: api
 output: petstore-server.gen.go
 additional-imports:
-  - package: github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models
+  - package: github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api/models
     alias: .
 generate:
   echo-server: true
diff --git a/examples/petstore-expanded/echo/petstore.go b/examples/petstore-expanded/echo/petstore.go
index 5ea0250507..49238f15b0 100644
--- a/examples/petstore-expanded/echo/petstore.go
+++ b/examples/petstore-expanded/echo/petstore.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api"
 	middleware "github.com/oapi-codegen/echo-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/echo/petstore_test.go b/examples/petstore-expanded/echo/petstore_test.go
index 5fc058da94..836c1ee051 100644
--- a/examples/petstore-expanded/echo/petstore_test.go
+++ b/examples/petstore-expanded/echo/petstore_test.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/labstack/echo/v4"
 	echoMiddleware "github.com/labstack/echo/v4/middleware"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
 	middleware "github.com/oapi-codegen/echo-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go
index de651ec54f..342ab9c102 100644
--- a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go
+++ b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go
@@ -9,9 +9,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	examplePetstoreClient "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded"
-	examplePetstore "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
+	examplePetstoreClient "github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded"
+	examplePetstore "github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/echo/api"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/lint"
 )
diff --git a/examples/petstore-expanded/fiber/api/petstore-server.gen.go b/examples/petstore-expanded/fiber/api/petstore-server.gen.go
index 5b01b84a07..48c4428fa1 100644
--- a/examples/petstore-expanded/fiber/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/fiber/api/petstore-server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/fiber/api/petstore-types.gen.go b/examples/petstore-expanded/fiber/api/petstore-types.gen.go
index 0e4954f349..7de719b878 100644
--- a/examples/petstore-expanded/fiber/api/petstore-types.gen.go
+++ b/examples/petstore-expanded/fiber/api/petstore-types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Error defines model for Error.
diff --git a/examples/petstore-expanded/fiber/api/petstore.go b/examples/petstore-expanded/fiber/api/petstore.go
index 38eec12d65..71d24b0194 100644
--- a/examples/petstore-expanded/fiber/api/petstore.go
+++ b/examples/petstore-expanded/fiber/api/petstore.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/fiber/petstore.go b/examples/petstore-expanded/fiber/petstore.go
index 6332ff8866..97926d9203 100644
--- a/examples/petstore-expanded/fiber/petstore.go
+++ b/examples/petstore-expanded/fiber/petstore.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
 	middleware "github.com/oapi-codegen/fiber-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/fiber/petstore_test.go b/examples/petstore-expanded/fiber/petstore_test.go
index dac1d58bf0..08e8bd8916 100644
--- a/examples/petstore-expanded/fiber/petstore_test.go
+++ b/examples/petstore-expanded/fiber/petstore_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/fiber/api"
 )
 
 func doGet(t *testing.T, app *fiber.App, rawURL string) (*http.Response, error) {
diff --git a/examples/petstore-expanded/gin/api/petstore-server.gen.go b/examples/petstore-expanded/gin/api/petstore-server.gen.go
index 02499fcc18..db64faed0a 100644
--- a/examples/petstore-expanded/gin/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/gin/api/petstore-server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/gin/api/petstore-types.gen.go b/examples/petstore-expanded/gin/api/petstore-types.gen.go
index 0e4954f349..7de719b878 100644
--- a/examples/petstore-expanded/gin/api/petstore-types.gen.go
+++ b/examples/petstore-expanded/gin/api/petstore-types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Error defines model for Error.
diff --git a/examples/petstore-expanded/gin/api/petstore.go b/examples/petstore-expanded/gin/api/petstore.go
index 094b4ef9eb..a37869d1ef 100644
--- a/examples/petstore-expanded/gin/api/petstore.go
+++ b/examples/petstore-expanded/gin/api/petstore.go
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/gin/petstore.go b/examples/petstore-expanded/gin/petstore.go
index 8b0717a4c8..13b983b82c 100644
--- a/examples/petstore-expanded/gin/petstore.go
+++ b/examples/petstore-expanded/gin/petstore.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/gin/api"
 	middleware "github.com/oapi-codegen/gin-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api"
 )
 
 func NewGinPetServer(petStore *api.PetStore, port string) *http.Server {
diff --git a/examples/petstore-expanded/gin/petstore_test.go b/examples/petstore-expanded/gin/petstore_test.go
index d7a557d1cb..c2389ad7b4 100644
--- a/examples/petstore-expanded/gin/petstore_test.go
+++ b/examples/petstore-expanded/gin/petstore_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/gin/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/examples/petstore-expanded/gorilla/api/petstore.gen.go b/examples/petstore-expanded/gorilla/api/petstore.gen.go
index 0ccc7da0b5..5fe5759204 100644
--- a/examples/petstore-expanded/gorilla/api/petstore.gen.go
+++ b/examples/petstore-expanded/gorilla/api/petstore.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/gorilla/api/petstore.go b/examples/petstore-expanded/gorilla/api/petstore.go
index 6ede559ec5..5560860db7 100644
--- a/examples/petstore-expanded/gorilla/api/petstore.go
+++ b/examples/petstore-expanded/gorilla/api/petstore.go
@@ -1,4 +1,4 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/gorilla/petstore.go b/examples/petstore-expanded/gorilla/petstore.go
index d1675f1ae3..3bbbebc143 100644
--- a/examples/petstore-expanded/gorilla/petstore.go
+++ b/examples/petstore-expanded/gorilla/petstore.go
@@ -13,8 +13,8 @@ import (
 	"os"
 
 	"github.com/gorilla/mux"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/gorilla/petstore_test.go b/examples/petstore-expanded/gorilla/petstore_test.go
index a6cfedecd8..4200dc59ab 100644
--- a/examples/petstore-expanded/gorilla/petstore_test.go
+++ b/examples/petstore-expanded/gorilla/petstore_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/petstore-expanded/internal/doc.go b/examples/petstore-expanded/internal/doc.go
index b04cac3f8d..efb62ef6f0 100644
--- a/examples/petstore-expanded/internal/doc.go
+++ b/examples/petstore-expanded/internal/doc.go
@@ -17,4 +17,4 @@ package internal
 // server. The file petstore.gen.go is automatically generated from the schema
 
 // Run oapi-codegen to regenerate the petstore boilerplate
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml
diff --git a/examples/petstore-expanded/iris/api/petstore-server.gen.go b/examples/petstore-expanded/iris/api/petstore-server.gen.go
index a559c238d5..3a356baecd 100644
--- a/examples/petstore-expanded/iris/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/iris/api/petstore-server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/iris/api/petstore-types.gen.go b/examples/petstore-expanded/iris/api/petstore-types.gen.go
index 0e4954f349..7de719b878 100644
--- a/examples/petstore-expanded/iris/api/petstore-types.gen.go
+++ b/examples/petstore-expanded/iris/api/petstore-types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Error defines model for Error.
diff --git a/examples/petstore-expanded/iris/api/petstore.go b/examples/petstore-expanded/iris/api/petstore.go
index d1e8018012..e8c120736e 100644
--- a/examples/petstore-expanded/iris/api/petstore.go
+++ b/examples/petstore-expanded/iris/api/petstore.go
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/iris/petstore.go b/examples/petstore-expanded/iris/petstore.go
index 2b2dea37f7..4b4eb10de3 100644
--- a/examples/petstore-expanded/iris/petstore.go
+++ b/examples/petstore-expanded/iris/petstore.go
@@ -12,8 +12,8 @@ import (
 	"os"
 
 	"github.com/kataras/iris/v12"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/iris/api"
 	middleware "github.com/oapi-codegen/iris-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api"
 )
 
 func NewIrisPetServer(petStore *api.PetStore, port int) *iris.Application {
diff --git a/examples/petstore-expanded/iris/petstore_test.go b/examples/petstore-expanded/iris/petstore_test.go
index 837a53369c..29cea3c2ee 100644
--- a/examples/petstore-expanded/iris/petstore_test.go
+++ b/examples/petstore-expanded/iris/petstore_test.go
@@ -21,7 +21,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/iris/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/examples/petstore-expanded/petstore-client.gen.go b/examples/petstore-expanded/petstore-client.gen.go
index 9bd928f497..2af710f22b 100644
--- a/examples/petstore-expanded/petstore-client.gen.go
+++ b/examples/petstore-expanded/petstore-client.gen.go
@@ -1,6 +1,6 @@
 // Package petstore provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package petstore
 
 import (
diff --git a/examples/petstore-expanded/stdhttp/api/petstore.gen.go b/examples/petstore-expanded/stdhttp/api/petstore.gen.go
index 3f99776250..4e671df02f 100644
--- a/examples/petstore-expanded/stdhttp/api/petstore.gen.go
+++ b/examples/petstore-expanded/stdhttp/api/petstore.gen.go
@@ -2,7 +2,7 @@
 
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/stdhttp/api/petstore.go b/examples/petstore-expanded/stdhttp/api/petstore.go
index 5b9d8606f1..109c83b144 100644
--- a/examples/petstore-expanded/stdhttp/api/petstore.go
+++ b/examples/petstore-expanded/stdhttp/api/petstore.go
@@ -1,6 +1,6 @@
 //go:build go1.22
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/stdhttp/go.mod b/examples/petstore-expanded/stdhttp/go.mod
index b49ad323c4..c3362fd72a 100644
--- a/examples/petstore-expanded/stdhttp/go.mod
+++ b/examples/petstore-expanded/stdhttp/go.mod
@@ -1,13 +1,13 @@
-module github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp
+module github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/stdhttp
 
 go 1.22
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../
+replace github.com/northvolt/oapi-codegen/v2 => ../../../
 
 require (
 	github.com/getkin/kin-openapi v0.127.0
 	github.com/oapi-codegen/nethttp-middleware v1.0.2
-	github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
 	github.com/oapi-codegen/runtime v1.1.0
 	github.com/oapi-codegen/testutil v1.0.0
 	github.com/stretchr/testify v1.9.0
diff --git a/examples/petstore-expanded/stdhttp/petstore.go b/examples/petstore-expanded/stdhttp/petstore.go
index 68e45cc1d7..20f60ec377 100644
--- a/examples/petstore-expanded/stdhttp/petstore.go
+++ b/examples/petstore-expanded/stdhttp/petstore.go
@@ -14,8 +14,8 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/stdhttp/petstore_test.go b/examples/petstore-expanded/stdhttp/petstore_test.go
index bf3df022d2..1eadb5a429 100644
--- a/examples/petstore-expanded/stdhttp/petstore_test.go
+++ b/examples/petstore-expanded/stdhttp/petstore_test.go
@@ -9,8 +9,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/petstore-expanded/stdhttp/tools/tools.go b/examples/petstore-expanded/stdhttp/tools/tools.go
index 8615cb4c57..1a90dde50c 100644
--- a/examples/petstore-expanded/stdhttp/tools/tools.go
+++ b/examples/petstore-expanded/stdhttp/tools/tools.go
@@ -4,5 +4,5 @@
 package tools
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
diff --git a/examples/petstore-expanded/strict/api/petstore-server.gen.go b/examples/petstore-expanded/strict/api/petstore-server.gen.go
index f1ba3d6d44..c903952a37 100644
--- a/examples/petstore-expanded/strict/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/strict/api/petstore-server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/examples/petstore-expanded/strict/api/petstore-types.gen.go b/examples/petstore-expanded/strict/api/petstore-types.gen.go
index 0e4954f349..7de719b878 100644
--- a/examples/petstore-expanded/strict/api/petstore-types.gen.go
+++ b/examples/petstore-expanded/strict/api/petstore-types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Error defines model for Error.
diff --git a/examples/petstore-expanded/strict/api/petstore.go b/examples/petstore-expanded/strict/api/petstore.go
index fc5c9fda2f..2618af6c91 100644
--- a/examples/petstore-expanded/strict/api/petstore.go
+++ b/examples/petstore-expanded/strict/api/petstore.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml
 
 package api
 
diff --git a/examples/petstore-expanded/strict/petstore.go b/examples/petstore-expanded/strict/petstore.go
index 363caf7e1a..1fde02994e 100644
--- a/examples/petstore-expanded/strict/petstore.go
+++ b/examples/petstore-expanded/strict/petstore.go
@@ -13,8 +13,8 @@ import (
 	"os"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/strict/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api"
 )
 
 func main() {
diff --git a/examples/petstore-expanded/strict/petstore_test.go b/examples/petstore-expanded/strict/petstore_test.go
index 208b65ea3e..af7d262af0 100644
--- a/examples/petstore-expanded/strict/petstore_test.go
+++ b/examples/petstore-expanded/strict/petstore_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded/strict/api"
 	middleware "github.com/oapi-codegen/nethttp-middleware"
-	"github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api"
 	"github.com/oapi-codegen/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/examples/tools.go b/examples/tools.go
index 8615cb4c57..1a90dde50c 100644
--- a/examples/tools.go
+++ b/examples/tools.go
@@ -4,5 +4,5 @@
 package tools
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
diff --git a/go.mod b/go.mod
index 7b15915468..836afa47f3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/oapi-codegen/oapi-codegen/v2
+module github.com/northvolt/oapi-codegen/v2
 
 go 1.21.13
 
diff --git a/internal/test/all_of/doc.go b/internal/test/all_of/doc.go
index b154cb2245..1c466b6013 100644
--- a/internal/test/all_of/doc.go
+++ b/internal/test/all_of/doc.go
@@ -1,4 +1,4 @@
 package allof
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml
diff --git a/internal/test/all_of/v1/openapi.gen.go b/internal/test/all_of/v1/openapi.gen.go
index db5fd302cd..f63e190cb7 100644
--- a/internal/test/all_of/v1/openapi.gen.go
+++ b/internal/test/all_of/v1/openapi.gen.go
@@ -1,6 +1,6 @@
 // Package v1 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package v1
 
 import (
diff --git a/internal/test/all_of/v2/openapi.gen.go b/internal/test/all_of/v2/openapi.gen.go
index ab430340d6..97fb4b2ea4 100644
--- a/internal/test/all_of/v2/openapi.gen.go
+++ b/internal/test/all_of/v2/openapi.gen.go
@@ -1,6 +1,6 @@
 // Package v2 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package v2
 
 import (
diff --git a/internal/test/any_of/codegen/inline/generate.go b/internal/test/any_of/codegen/inline/generate.go
index 020b7dc9d8..bfe9b66346 100644
--- a/internal/test/any_of/codegen/inline/generate.go
+++ b/internal/test/any_of/codegen/inline/generate.go
@@ -1,3 +1,3 @@
 package inline
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/any_of/codegen/inline/openapi.gen.go b/internal/test/any_of/codegen/inline/openapi.gen.go
index d3f34bec6e..fc5992f6f1 100644
--- a/internal/test/any_of/codegen/inline/openapi.gen.go
+++ b/internal/test/any_of/codegen/inline/openapi.gen.go
@@ -1,6 +1,6 @@
 // Package inline provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package inline
 
 import (
diff --git a/internal/test/any_of/codegen/ref_schema/generate.go b/internal/test/any_of/codegen/ref_schema/generate.go
index 061e2a828d..78d7898b40 100644
--- a/internal/test/any_of/codegen/ref_schema/generate.go
+++ b/internal/test/any_of/codegen/ref_schema/generate.go
@@ -1,3 +1,3 @@
 package ref_schema
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/any_of/codegen/ref_schema/openapi.gen.go b/internal/test/any_of/codegen/ref_schema/openapi.gen.go
index 38f87c47be..073356c8a6 100644
--- a/internal/test/any_of/codegen/ref_schema/openapi.gen.go
+++ b/internal/test/any_of/codegen/ref_schema/openapi.gen.go
@@ -1,6 +1,6 @@
 // Package ref_schema provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package ref_schema
 
 import (
diff --git a/internal/test/any_of/param/doc.go b/internal/test/any_of/param/doc.go
index 657385e03f..3348230753 100644
--- a/internal/test/any_of/param/doc.go
+++ b/internal/test/any_of/param/doc.go
@@ -1,3 +1,3 @@
 package param
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/any_of/param/param.gen.go b/internal/test/any_of/param/param.gen.go
index 3378ae3da1..eeed1624c2 100644
--- a/internal/test/any_of/param/param.gen.go
+++ b/internal/test/any_of/param/param.gen.go
@@ -1,6 +1,6 @@
 // Package param provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package param
 
 import (
diff --git a/internal/test/any_of/param/param_test.go b/internal/test/any_of/param/param_test.go
index 94641b3650..ba4fcc26fd 100644
--- a/internal/test/any_of/param/param_test.go
+++ b/internal/test/any_of/param/param_test.go
@@ -3,7 +3,7 @@ package param_test
 import (
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/internal/test/any_of/param"
+	"github.com/northvolt/oapi-codegen/v2/internal/test/any_of/param"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/test/client/client.gen.go b/internal/test/client/client.gen.go
index 275c72cf0f..539bea4f8d 100644
--- a/internal/test/client/client.gen.go
+++ b/internal/test/client/client.gen.go
@@ -1,6 +1,6 @@
 // Package client provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package client
 
 import (
diff --git a/internal/test/client/client_test.go b/internal/test/client/client_test.go
index ef7c5df169..ee1030f302 100644
--- a/internal/test/client/client_test.go
+++ b/internal/test/client/client_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
+	"github.com/northvolt/oapi-codegen/v2/pkg/securityprovider"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/test/client/doc.go b/internal/test/client/doc.go
index 930039dadd..9d5adee6dc 100644
--- a/internal/test/client/doc.go
+++ b/internal/test/client/doc.go
@@ -1,3 +1,3 @@
 package client
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml
diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go
index 95257707b1..ae5b7cac7f 100644
--- a/internal/test/components/components.gen.go
+++ b/internal/test/components/components.gen.go
@@ -1,6 +1,6 @@
 // Package components provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package components
 
 import (
diff --git a/internal/test/components/doc.go b/internal/test/components/doc.go
index 64f995a9c0..04d43184b3 100644
--- a/internal/test/components/doc.go
+++ b/internal/test/components/doc.go
@@ -1,3 +1,3 @@
 package components
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml
diff --git a/internal/test/cookies/cookies.gen.go b/internal/test/cookies/cookies.gen.go
index 5168bbd153..6565c49fa5 100644
--- a/internal/test/cookies/cookies.gen.go
+++ b/internal/test/cookies/cookies.gen.go
@@ -1,6 +1,6 @@
 // Package cookies provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package cookies
 
 import (
diff --git a/internal/test/cookies/generate.go b/internal/test/cookies/generate.go
index 46a9a52676..6d81060e8f 100644
--- a/internal/test/cookies/generate.go
+++ b/internal/test/cookies/generate.go
@@ -1,3 +1,3 @@
 package cookies
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/extensions/x-order/generate.go b/internal/test/extensions/x-order/generate.go
index 8970f968ac..b56de466ae 100644
--- a/internal/test/extensions/x-order/generate.go
+++ b/internal/test/extensions/x-order/generate.go
@@ -1,3 +1,3 @@
 package xorder
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/extensions/x-order/issue.gen.go b/internal/test/extensions/x-order/issue.gen.go
index c665ee8ad5..5d41204679 100644
--- a/internal/test/extensions/x-order/issue.gen.go
+++ b/internal/test/extensions/x-order/issue.gen.go
@@ -1,6 +1,6 @@
 // Package xorder provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package xorder
 
 import (
diff --git a/internal/test/externalref/doc.go b/internal/test/externalref/doc.go
index c5aeaa5221..4d4093ced9 100644
--- a/internal/test/externalref/doc.go
+++ b/internal/test/externalref/doc.go
@@ -1,3 +1,3 @@
 package externalref
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml
diff --git a/internal/test/externalref/externalref.cfg.yaml b/internal/test/externalref/externalref.cfg.yaml
index 22a76c3ffd..308cd5809c 100644
--- a/internal/test/externalref/externalref.cfg.yaml
+++ b/internal/test/externalref/externalref.cfg.yaml
@@ -4,9 +4,9 @@ generate:
   models: true
   embedded-spec: true
 import-mapping:
-  ./packageA/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA
-  ./packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB
-  https://petstore3.swagger.io/api/v3/openapi.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore
+  ./packageA/spec.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageA
+  ./packageB/spec.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB
+  https://petstore3.swagger.io/api/v3/openapi.json: github.com/northvolt/oapi-codegen/v2/internal/test/externalref/petstore
 output: externalref.gen.go
 output-options:
   skip-prune: true
diff --git a/internal/test/externalref/externalref.gen.go b/internal/test/externalref/externalref.gen.go
index eee3f68f71..c6ce335a23 100644
--- a/internal/test/externalref/externalref.gen.go
+++ b/internal/test/externalref/externalref.gen.go
@@ -1,6 +1,6 @@
 // Package externalref provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package externalref
 
 import (
@@ -13,9 +13,9 @@ import (
 	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA"
-	externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB"
-	externalRef2 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageA"
+	externalRef1 "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB"
+	externalRef2 "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/petstore"
 )
 
 // Container defines model for Container.
diff --git a/internal/test/externalref/imports_test.go b/internal/test/externalref/imports_test.go
index 34fd0ec11e..9577bdda74 100644
--- a/internal/test/externalref/imports_test.go
+++ b/internal/test/externalref/imports_test.go
@@ -3,9 +3,9 @@ package externalref
 import (
 	"testing"
 
-	packageA "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA"
-	packageB "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB"
-	petstore "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore"
+	packageA "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageA"
+	packageB "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB"
+	petstore "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/petstore"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/externalref/packageA/config.yaml b/internal/test/externalref/packageA/config.yaml
index 6ee1a13699..845dab4a87 100644
--- a/internal/test/externalref/packageA/config.yaml
+++ b/internal/test/externalref/packageA/config.yaml
@@ -6,5 +6,5 @@ generate:
 output-options:
   skip-prune: true
 import-mapping:
-  ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB
+  ../packageB/spec.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB
 output: externalref.gen.go
diff --git a/internal/test/externalref/packageA/doc.go b/internal/test/externalref/packageA/doc.go
index f05471ffbb..98081d289f 100644
--- a/internal/test/externalref/packageA/doc.go
+++ b/internal/test/externalref/packageA/doc.go
@@ -1,3 +1,3 @@
 package packagea
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/externalref/packageA/externalref.gen.go b/internal/test/externalref/packageA/externalref.gen.go
index c95790d770..2f6e84dc17 100644
--- a/internal/test/externalref/packageA/externalref.gen.go
+++ b/internal/test/externalref/packageA/externalref.gen.go
@@ -1,6 +1,6 @@
 // Package packagea provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package packagea
 
 import (
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB"
 )
 
 // ObjectA defines model for ObjectA.
diff --git a/internal/test/externalref/packageB/doc.go b/internal/test/externalref/packageB/doc.go
index 0dc18f8255..59c80d38de 100644
--- a/internal/test/externalref/packageB/doc.go
+++ b/internal/test/externalref/packageB/doc.go
@@ -1,3 +1,3 @@
 package packageb
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/externalref/packageB/externalref.gen.go b/internal/test/externalref/packageB/externalref.gen.go
index c3f879cfda..85f58a1bf5 100644
--- a/internal/test/externalref/packageB/externalref.gen.go
+++ b/internal/test/externalref/packageB/externalref.gen.go
@@ -1,6 +1,6 @@
 // Package packageb provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package packageb
 
 import (
diff --git a/internal/test/externalref/petstore/config.yaml b/internal/test/externalref/petstore/config.yaml
index 6ee1a13699..845dab4a87 100644
--- a/internal/test/externalref/petstore/config.yaml
+++ b/internal/test/externalref/petstore/config.yaml
@@ -6,5 +6,5 @@ generate:
 output-options:
   skip-prune: true
 import-mapping:
-  ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB
+  ../packageB/spec.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB
 output: externalref.gen.go
diff --git a/internal/test/externalref/petstore/doc.go b/internal/test/externalref/petstore/doc.go
index f05471ffbb..98081d289f 100644
--- a/internal/test/externalref/petstore/doc.go
+++ b/internal/test/externalref/petstore/doc.go
@@ -1,3 +1,3 @@
 package packagea
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/externalref/petstore/externalref.gen.go b/internal/test/externalref/petstore/externalref.gen.go
index c1d5d3e10d..70a2e3e0ad 100644
--- a/internal/test/externalref/petstore/externalref.gen.go
+++ b/internal/test/externalref/petstore/externalref.gen.go
@@ -1,6 +1,6 @@
 // Package packagea provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package packagea
 
 import (
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/externalref/packageB"
 )
 
 const (
diff --git a/internal/test/filter/doc.go b/internal/test/filter/doc.go
index a9051b1015..6de05715f2 100644
--- a/internal/test/filter/doc.go
+++ b/internal/test/filter/doc.go
@@ -1,4 +1,4 @@
 package client
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml
diff --git a/internal/test/filter/operations/server.gen.go b/internal/test/filter/operations/server.gen.go
index 49fc69b5e5..e86ca8f782 100644
--- a/internal/test/filter/operations/server.gen.go
+++ b/internal/test/filter/operations/server.gen.go
@@ -1,6 +1,6 @@
 // Package filteroperations provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package filteroperations
 
 import (
diff --git a/internal/test/filter/tags/server.gen.go b/internal/test/filter/tags/server.gen.go
index 8137c0f39c..24852d8202 100644
--- a/internal/test/filter/tags/server.gen.go
+++ b/internal/test/filter/tags/server.gen.go
@@ -1,6 +1,6 @@
 // Package filtertags provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package filtertags
 
 import (
diff --git a/internal/test/go.mod b/internal/test/go.mod
index a3e01f4ec9..42c85b4c12 100644
--- a/internal/test/go.mod
+++ b/internal/test/go.mod
@@ -1,8 +1,8 @@
-module github.com/oapi-codegen/oapi-codegen/v2/internal/test
+module github.com/northvolt/oapi-codegen/v2/internal/test
 
 go 1.21.13
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../../
+replace github.com/northvolt/oapi-codegen/v2 => ../../
 
 require (
 	github.com/getkin/kin-openapi v0.127.0
@@ -13,7 +13,7 @@ require (
 	github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9
 	github.com/labstack/echo/v4 v4.11.3
 	github.com/oapi-codegen/nullable v1.0.1
-	github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
 	github.com/oapi-codegen/runtime v1.1.0
 	github.com/oapi-codegen/testutil v1.0.0
 	github.com/stretchr/testify v1.9.0
diff --git a/internal/test/issues/issue-1039/client.gen.go b/internal/test/issues/issue-1039/client.gen.go
index 3114f29862..e7f06fc3ec 100644
--- a/internal/test/issues/issue-1039/client.gen.go
+++ b/internal/test/issues/issue-1039/client.gen.go
@@ -1,6 +1,6 @@
 // Package issue1039 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1039
 
 import (
diff --git a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go
index b148f37830..e432ec61c7 100644
--- a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go
+++ b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go
@@ -1,6 +1,6 @@
 // Package defaultbehaviour provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package defaultbehaviour
 
 // PatchRequest A request to patch an existing user object.
diff --git a/internal/test/issues/issue-1039/doc.go b/internal/test/issues/issue-1039/doc.go
index 2997380aaf..cec0f77efd 100644
--- a/internal/test/issues/issue-1039/doc.go
+++ b/internal/test/issues/issue-1039/doc.go
@@ -1,6 +1,6 @@
 package issue1039
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml
diff --git a/internal/test/issues/issue-1039/server.gen.go b/internal/test/issues/issue-1039/server.gen.go
index a39f95dae7..8cc8e7c3c5 100644
--- a/internal/test/issues/issue-1039/server.gen.go
+++ b/internal/test/issues/issue-1039/server.gen.go
@@ -1,6 +1,6 @@
 // Package issue1039 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1039
 
 import (
diff --git a/internal/test/issues/issue-1039/types.gen.go b/internal/test/issues/issue-1039/types.gen.go
index 9c11915344..62cd9b58da 100644
--- a/internal/test/issues/issue-1039/types.gen.go
+++ b/internal/test/issues/issue-1039/types.gen.go
@@ -1,6 +1,6 @@
 // Package issue1039 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1039
 
 import (
diff --git a/internal/test/issues/issue-1087/api.gen.go b/internal/test/issues/issue-1087/api.gen.go
index 3c408cc8f9..70bec802ca 100644
--- a/internal/test/issues/issue-1087/api.gen.go
+++ b/internal/test/issues/issue-1087/api.gen.go
@@ -1,6 +1,6 @@
 // Package issue1087 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1087
 
 import (
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"github.com/go-chi/chi/v5"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1087/deps"
 )
 
 // Thing defines model for Thing.
diff --git a/internal/test/issues/issue-1087/deps/deps.gen.go b/internal/test/issues/issue-1087/deps/deps.gen.go
index 8066ab2b57..0706efc331 100644
--- a/internal/test/issues/issue-1087/deps/deps.gen.go
+++ b/internal/test/issues/issue-1087/deps/deps.gen.go
@@ -1,6 +1,6 @@
 // Package deps provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package deps
 
 import (
diff --git a/internal/test/issues/issue-1087/deps/doc.go b/internal/test/issues/issue-1087/deps/doc.go
index 0684d56cae..5c6c7ed65a 100644
--- a/internal/test/issues/issue-1087/deps/doc.go
+++ b/internal/test/issues/issue-1087/deps/doc.go
@@ -1,3 +1,3 @@
 package deps
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json
diff --git a/internal/test/issues/issue-1087/doc.go b/internal/test/issues/issue-1087/doc.go
index 2ad8db520c..6d0633a6e2 100644
--- a/internal/test/issues/issue-1087/doc.go
+++ b/internal/test/issues/issue-1087/doc.go
@@ -1,3 +1,3 @@
 package issue1087
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
diff --git a/internal/test/issues/issue-1087/server.config.yaml b/internal/test/issues/issue-1087/server.config.yaml
index 6d795c05d7..b0fb8a5c15 100644
--- a/internal/test/issues/issue-1087/server.config.yaml
+++ b/internal/test/issues/issue-1087/server.config.yaml
@@ -8,4 +8,4 @@ generate:
   embedded-spec: false
   client: true
 import-mapping:
-  ./deps/my-deps.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps
+  ./deps/my-deps.json: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1087/deps
diff --git a/internal/test/issues/issue-1093/api/child/child.gen.go b/internal/test/issues/issue-1093/api/child/child.gen.go
index 21e57fe8f7..19f95b3898 100644
--- a/internal/test/issues/issue-1093/api/child/child.gen.go
+++ b/internal/test/issues/issue-1093/api/child/child.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
@@ -17,7 +17,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/gin-gonic/gin"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent"
 	strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin"
 )
 
diff --git a/internal/test/issues/issue-1093/api/parent/parent.gen.go b/internal/test/issues/issue-1093/api/parent/parent.gen.go
index 916772b07d..db384ec3d9 100644
--- a/internal/test/issues/issue-1093/api/parent/parent.gen.go
+++ b/internal/test/issues/issue-1093/api/parent/parent.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/issues/issue-1093/child.cfg.yaml b/internal/test/issues/issue-1093/child.cfg.yaml
index 4efb750c1e..9a69c8960b 100644
--- a/internal/test/issues/issue-1093/child.cfg.yaml
+++ b/internal/test/issues/issue-1093/child.cfg.yaml
@@ -7,5 +7,5 @@ generate:
   strict-server: true
   models: true
 import-mapping:
-  parent.api.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent
+  parent.api.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent
 output: api/child/child.gen.go
diff --git a/internal/test/issues/issue-1093/doc.go b/internal/test/issues/issue-1093/doc.go
index 6996cdd2d8..3786683de8 100644
--- a/internal/test/issues/issue-1093/doc.go
+++ b/internal/test/issues/issue-1093/doc.go
@@ -2,5 +2,5 @@
 // See https://github.com/oapi-codegen/oapi-codegen/issues/1093
 package issue1093
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml
diff --git a/internal/test/issues/issue-1093/issue_test.go b/internal/test/issues/issue-1093/issue_test.go
index 990de85384..a778faf5a0 100644
--- a/internal/test/issues/issue-1093/issue_test.go
+++ b/internal/test/issues/issue-1093/issue_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
 )
 
 //go:embed child.api.yaml
@@ -29,7 +29,7 @@ func TestIssue(t *testing.T) {
 			EmbeddedSpec: true,
 		},
 		ImportMapping: map[string]string{
-			"parent.api.yaml": "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent",
+			"parent.api.yaml": "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent",
 		},
 	}
 
diff --git a/internal/test/issues/issue-1127/api.gen.go b/internal/test/issues/issue-1127/api.gen.go
index d3fa8e4293..5e99d027a5 100644
--- a/internal/test/issues/issue-1127/api.gen.go
+++ b/internal/test/issues/issue-1127/api.gen.go
@@ -1,6 +1,6 @@
 // Package issue1127 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1127
 
 // Whatever defines model for Whatever.
diff --git a/internal/test/issues/issue-1127/doc.go b/internal/test/issues/issue-1127/doc.go
index d591e52f84..fe4807161c 100644
--- a/internal/test/issues/issue-1127/doc.go
+++ b/internal/test/issues/issue-1127/doc.go
@@ -1,3 +1,3 @@
 package issue1127
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
diff --git a/internal/test/issues/issue-1168/api.gen.go b/internal/test/issues/issue-1168/api.gen.go
index d681fbd81c..e29796691d 100644
--- a/internal/test/issues/issue-1168/api.gen.go
+++ b/internal/test/issues/issue-1168/api.gen.go
@@ -1,6 +1,6 @@
 // Package issue1168 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1168
 
 import (
diff --git a/internal/test/issues/issue-1168/doc.go b/internal/test/issues/issue-1168/doc.go
index 2541e721d1..99f853bb69 100644
--- a/internal/test/issues/issue-1168/doc.go
+++ b/internal/test/issues/issue-1168/doc.go
@@ -1,3 +1,3 @@
 package issue1168
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
diff --git a/internal/test/issues/issue-1180/doc.go b/internal/test/issues/issue-1180/doc.go
index 5fcca2b965..ed9bc205f8 100644
--- a/internal/test/issues/issue-1180/doc.go
+++ b/internal/test/issues/issue-1180/doc.go
@@ -1,3 +1,3 @@
 package issue1180
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml
diff --git a/internal/test/issues/issue-1180/issue.gen.go b/internal/test/issues/issue-1180/issue.gen.go
index cc675b96da..c4b45f0dd4 100644
--- a/internal/test/issues/issue-1180/issue.gen.go
+++ b/internal/test/issues/issue-1180/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue1180 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1180
 
 import (
diff --git a/internal/test/issues/issue-1182/pkg1/config.yaml b/internal/test/issues/issue-1182/pkg1/config.yaml
index a300242fbc..7e2a6cf27b 100644
--- a/internal/test/issues/issue-1182/pkg1/config.yaml
+++ b/internal/test/issues/issue-1182/pkg1/config.yaml
@@ -8,4 +8,4 @@ generate:
   strict-server: true
 output: pkg1.gen.go
 import-mapping:
-  pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2
+  pkg2.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2
diff --git a/internal/test/issues/issue-1182/pkg1/doc.go b/internal/test/issues/issue-1182/pkg1/doc.go
index 8b57f0836f..f4e6f86f6f 100644
--- a/internal/test/issues/issue-1182/pkg1/doc.go
+++ b/internal/test/issues/issue-1182/pkg1/doc.go
@@ -1,3 +1,3 @@
 package pkg1
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml
diff --git a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go
index 7be0da44a6..2514cbb4fa 100644
--- a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go
+++ b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go
@@ -1,6 +1,6 @@
 // Package pkg1 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package pkg1
 
 import (
@@ -17,7 +17,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2"
 	strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo"
 )
 
diff --git a/internal/test/issues/issue-1182/pkg2/doc.go b/internal/test/issues/issue-1182/pkg2/doc.go
index 68cb0b78a1..c06180d40a 100644
--- a/internal/test/issues/issue-1182/pkg2/doc.go
+++ b/internal/test/issues/issue-1182/pkg2/doc.go
@@ -1,3 +1,3 @@
 package pkg2
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml
diff --git a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go
index 51eece40aa..7a9a6fee85 100644
--- a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go
+++ b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go
@@ -1,6 +1,6 @@
 // Package pkg2 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package pkg2
 
 import (
diff --git a/internal/test/issues/issue-1189/doc.go b/internal/test/issues/issue-1189/doc.go
index e64506f488..002c1c374b 100644
--- a/internal/test/issues/issue-1189/doc.go
+++ b/internal/test/issues/issue-1189/doc.go
@@ -1,3 +1,3 @@
 package param
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml
diff --git a/internal/test/issues/issue-1189/issue1189.gen.go b/internal/test/issues/issue-1189/issue1189.gen.go
index c1a869ad98..09671d5647 100644
--- a/internal/test/issues/issue-1189/issue1189.gen.go
+++ b/internal/test/issues/issue-1189/issue1189.gen.go
@@ -1,6 +1,6 @@
 // Package param provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package param
 
 import (
diff --git a/internal/test/issues/issue-1208-1209/doc.go b/internal/test/issues/issue-1208-1209/doc.go
index 7384a2ab9f..6d04e4cdc9 100644
--- a/internal/test/issues/issue-1208-1209/doc.go
+++ b/internal/test/issues/issue-1208-1209/doc.go
@@ -1,3 +1,3 @@
 package multijson
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml
diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go
index 780d45e6a7..79b8371efc 100644
--- a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go
+++ b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go
@@ -1,6 +1,6 @@
 // Package multijson provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package multijson
 
 import (
diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go
index 2c379909e9..d36ef87a1d 100644
--- a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go
+++ b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"testing"
 
-	multijson "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1208-1209"
+	multijson "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1208-1209"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/test/issues/issue-1212/pkg1/config.yaml b/internal/test/issues/issue-1212/pkg1/config.yaml
index 040b8223b7..c74b801d11 100644
--- a/internal/test/issues/issue-1212/pkg1/config.yaml
+++ b/internal/test/issues/issue-1212/pkg1/config.yaml
@@ -8,4 +8,4 @@ generate:
   strict-server: true
 output: pkg1.gen.go
 import-mapping:
-  pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2
+  pkg2.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2
diff --git a/internal/test/issues/issue-1212/pkg1/doc.go b/internal/test/issues/issue-1212/pkg1/doc.go
index 8b57f0836f..f4e6f86f6f 100644
--- a/internal/test/issues/issue-1212/pkg1/doc.go
+++ b/internal/test/issues/issue-1212/pkg1/doc.go
@@ -1,3 +1,3 @@
 package pkg1
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml
diff --git a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go
index f817ec8376..2194848d50 100644
--- a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go
+++ b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go
@@ -1,6 +1,6 @@
 // Package pkg1 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package pkg1
 
 import (
@@ -19,7 +19,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/gin-gonic/gin"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2"
 	strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin"
 )
 
diff --git a/internal/test/issues/issue-1212/pkg2/doc.go b/internal/test/issues/issue-1212/pkg2/doc.go
index 68cb0b78a1..c06180d40a 100644
--- a/internal/test/issues/issue-1212/pkg2/doc.go
+++ b/internal/test/issues/issue-1212/pkg2/doc.go
@@ -1,3 +1,3 @@
 package pkg2
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml
diff --git a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go
index 5a994ed06f..9c87d8f786 100644
--- a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go
+++ b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go
@@ -1,6 +1,6 @@
 // Package pkg2 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package pkg2
 
 import (
diff --git a/internal/test/issues/issue-1219/doc.go b/internal/test/issues/issue-1219/doc.go
index 7e1118e5c9..dab46a4382 100644
--- a/internal/test/issues/issue-1219/doc.go
+++ b/internal/test/issues/issue-1219/doc.go
@@ -1,3 +1,3 @@
 package issue1219
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml
diff --git a/internal/test/issues/issue-1219/issue.gen.go b/internal/test/issues/issue-1219/issue.gen.go
index 2beeedc59c..78224b7524 100644
--- a/internal/test/issues/issue-1219/issue.gen.go
+++ b/internal/test/issues/issue-1219/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue1219 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1219
 
 import (
diff --git a/internal/test/issues/issue-1219/issue_test.go b/internal/test/issues/issue-1219/issue_test.go
index aebd0d1afd..9f728f28e9 100644
--- a/internal/test/issues/issue-1219/issue_test.go
+++ b/internal/test/issues/issue-1219/issue_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	issue1219 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1219"
+	issue1219 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1219"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/test/issues/issue-1298/doc.go b/internal/test/issues/issue-1298/doc.go
index b5e5ee95c9..af23c882bf 100644
--- a/internal/test/issues/issue-1298/doc.go
+++ b/internal/test/issues/issue-1298/doc.go
@@ -1,3 +1,3 @@
 package issue1298
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml
diff --git a/internal/test/issues/issue-1298/issue1298.gen.go b/internal/test/issues/issue-1298/issue1298.gen.go
index 94734a5772..ce9fa3575a 100644
--- a/internal/test/issues/issue-1298/issue1298.gen.go
+++ b/internal/test/issues/issue-1298/issue1298.gen.go
@@ -1,6 +1,6 @@
 // Package issue1298 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1298
 
 import (
diff --git a/internal/test/issues/issue-1298/issue1298_test.go b/internal/test/issues/issue-1298/issue1298_test.go
index 0d627f10f5..2ec9b2161b 100644
--- a/internal/test/issues/issue-1298/issue1298_test.go
+++ b/internal/test/issues/issue-1298/issue1298_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	issue1298 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1298"
+	issue1298 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1298"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go
index 9f6ffc8809..ce258107d0 100644
--- a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go
+++ b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go
@@ -1,6 +1,6 @@
 // Package bionicle provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package bionicle
 
 import (
@@ -17,7 +17,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/gorilla/mux"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/common"
 	"github.com/oapi-codegen/runtime"
 	strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp"
 )
diff --git a/internal/test/issues/issue-1378/bionicle/config.yaml b/internal/test/issues/issue-1378/bionicle/config.yaml
index 4f81605dc4..a0dc2809db 100644
--- a/internal/test/issues/issue-1378/bionicle/config.yaml
+++ b/internal/test/issues/issue-1378/bionicle/config.yaml
@@ -6,5 +6,5 @@ generate:
   strict-server: true
   models: true
 import-mapping:
-  common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common
+  common.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/common
 output: bionicle.gen.go
diff --git a/internal/test/issues/issue-1378/bionicle/generate.go b/internal/test/issues/issue-1378/bionicle/generate.go
index 26b3661696..f49120b507 100644
--- a/internal/test/issues/issue-1378/bionicle/generate.go
+++ b/internal/test/issues/issue-1378/bionicle/generate.go
@@ -1,3 +1,3 @@
 package bionicle
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml
diff --git a/internal/test/issues/issue-1378/common/common.gen.go b/internal/test/issues/issue-1378/common/common.gen.go
index d1747783e0..d314c58bb9 100644
--- a/internal/test/issues/issue-1378/common/common.gen.go
+++ b/internal/test/issues/issue-1378/common/common.gen.go
@@ -1,6 +1,6 @@
 // Package common provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package common
 
 import (
diff --git a/internal/test/issues/issue-1378/common/generate.go b/internal/test/issues/issue-1378/common/generate.go
index dbb23b05d1..9c1ea6ecf0 100644
--- a/internal/test/issues/issue-1378/common/generate.go
+++ b/internal/test/issues/issue-1378/common/generate.go
@@ -1,3 +1,3 @@
 package common
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml
diff --git a/internal/test/issues/issue-1378/fooservice/config.yaml b/internal/test/issues/issue-1378/fooservice/config.yaml
index 4690bd037e..5bb92f37d0 100644
--- a/internal/test/issues/issue-1378/fooservice/config.yaml
+++ b/internal/test/issues/issue-1378/fooservice/config.yaml
@@ -6,6 +6,6 @@ generate:
   strict-server: true
   models: true
 import-mapping:
-  common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common
-  bionicle.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle
+  common.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/common
+  bionicle.yaml: github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle
 output: fooservice.gen.go
diff --git a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go
index c0542b6a55..fcac4b23cb 100644
--- a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go
+++ b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go
@@ -1,6 +1,6 @@
 // Package fooservice provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package fooservice
 
 import (
@@ -17,8 +17,8 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/gorilla/mux"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle"
-	externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle"
+	externalRef1 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-1378/common"
 	"github.com/oapi-codegen/runtime"
 	strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp"
 )
diff --git a/internal/test/issues/issue-1378/fooservice/generate.go b/internal/test/issues/issue-1378/fooservice/generate.go
index 2419719dbf..ed121f97a1 100644
--- a/internal/test/issues/issue-1378/fooservice/generate.go
+++ b/internal/test/issues/issue-1378/fooservice/generate.go
@@ -1,3 +1,3 @@
 package fooservice
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml
diff --git a/internal/test/issues/issue-1397/doc.go b/internal/test/issues/issue-1397/doc.go
index e5964fe298..476ce42c8d 100644
--- a/internal/test/issues/issue-1397/doc.go
+++ b/internal/test/issues/issue-1397/doc.go
@@ -1,3 +1,3 @@
 package issue1397
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-1397/issue1397.gen.go b/internal/test/issues/issue-1397/issue1397.gen.go
index 2463641eb1..0e7ddb8742 100644
--- a/internal/test/issues/issue-1397/issue1397.gen.go
+++ b/internal/test/issues/issue-1397/issue1397.gen.go
@@ -1,6 +1,6 @@
 // Package issue1397 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1397
 
 import (
diff --git a/internal/test/issues/issue-1676/generate.go b/internal/test/issues/issue-1676/generate.go
index 49aa70b8a9..ded45829b0 100644
--- a/internal/test/issues/issue-1676/generate.go
+++ b/internal/test/issues/issue-1676/generate.go
@@ -1,3 +1,3 @@
 package issue1676
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml
diff --git a/internal/test/issues/issue-1676/ping.gen.go b/internal/test/issues/issue-1676/ping.gen.go
index dcfddc3bc6..e68a33e339 100644
--- a/internal/test/issues/issue-1676/ping.gen.go
+++ b/internal/test/issues/issue-1676/ping.gen.go
@@ -1,6 +1,6 @@
 // Package issue1676 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1676
 
 import (
diff --git a/internal/test/issues/issue-312/doc.go b/internal/test/issues/issue-312/doc.go
index 768a4595b8..9cb2170e21 100644
--- a/internal/test/issues/issue-312/doc.go
+++ b/internal/test/issues/issue-312/doc.go
@@ -1,3 +1,3 @@
 package issue312
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-312/issue.gen.go b/internal/test/issues/issue-312/issue.gen.go
index f0285c071f..3f57821833 100644
--- a/internal/test/issues/issue-312/issue.gen.go
+++ b/internal/test/issues/issue-312/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue312 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue312
 
 import (
diff --git a/internal/test/issues/issue-52/doc.go b/internal/test/issues/issue-52/doc.go
index 3d239ebdcf..55c54aae7a 100644
--- a/internal/test/issues/issue-52/doc.go
+++ b/internal/test/issues/issue-52/doc.go
@@ -1,3 +1,3 @@
 package issue52
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-52/issue.gen.go b/internal/test/issues/issue-52/issue.gen.go
index f024999d6a..6a4e15e8e9 100644
--- a/internal/test/issues/issue-52/issue.gen.go
+++ b/internal/test/issues/issue-52/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue52 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue52
 
 import (
diff --git a/internal/test/issues/issue-52/issue_test.go b/internal/test/issues/issue-52/issue_test.go
index 0288c2aead..a99302a25b 100644
--- a/internal/test/issues/issue-52/issue_test.go
+++ b/internal/test/issues/issue-52/issue_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/issues/issue-579/gen.go b/internal/test/issues/issue-579/gen.go
index 7b198d0cdf..e76b307084 100644
--- a/internal/test/issues/issue-579/gen.go
+++ b/internal/test/issues/issue-579/gen.go
@@ -1,3 +1,3 @@
 package issue579
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml
diff --git a/internal/test/issues/issue-579/issue.gen.go b/internal/test/issues/issue-579/issue.gen.go
index 54326646d9..e76d5975ec 100644
--- a/internal/test/issues/issue-579/issue.gen.go
+++ b/internal/test/issues/issue-579/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue579 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue579
 
 import (
diff --git a/internal/test/issues/issue-832/generate.go b/internal/test/issues/issue-832/generate.go
index 79b06c7131..aea3497619 100644
--- a/internal/test/issues/issue-832/generate.go
+++ b/internal/test/issues/issue-832/generate.go
@@ -1,3 +1,3 @@
 package issue_832
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-832/issue.gen.go b/internal/test/issues/issue-832/issue.gen.go
index 0aa74f232e..3283d58c7e 100644
--- a/internal/test/issues/issue-832/issue.gen.go
+++ b/internal/test/issues/issue-832/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue_832 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue_832
 
 import (
diff --git a/internal/test/issues/issue-936/api.gen.go b/internal/test/issues/issue-936/api.gen.go
index 6b7c0cf220..fadff9e1b2 100644
--- a/internal/test/issues/issue-936/api.gen.go
+++ b/internal/test/issues/issue-936/api.gen.go
@@ -1,6 +1,6 @@
 // Package issue936 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue936
 
 import (
diff --git a/internal/test/issues/issue-936/gen.go b/internal/test/issues/issue-936/gen.go
index f1e62f42f1..92f6a06459 100644
--- a/internal/test/issues/issue-936/gen.go
+++ b/internal/test/issues/issue-936/gen.go
@@ -1,3 +1,3 @@
 package issue936
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml
diff --git a/internal/test/issues/issue-grab_import_names/doc.go b/internal/test/issues/issue-grab_import_names/doc.go
index e986569fcb..56417f271d 100644
--- a/internal/test/issues/issue-grab_import_names/doc.go
+++ b/internal/test/issues/issue-grab_import_names/doc.go
@@ -1,3 +1,3 @@
 package grabimportnames
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-grab_import_names/issue.gen.go b/internal/test/issues/issue-grab_import_names/issue.gen.go
index 52564c0dd9..ab24c8e8dc 100644
--- a/internal/test/issues/issue-grab_import_names/issue.gen.go
+++ b/internal/test/issues/issue-grab_import_names/issue.gen.go
@@ -1,6 +1,6 @@
 // Package grabimportnames provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package grabimportnames
 
 import (
diff --git a/internal/test/issues/issue-grab_import_names/issue_test.go b/internal/test/issues/issue-grab_import_names/issue_test.go
index 7d299fa22a..2901489ea4 100644
--- a/internal/test/issues/issue-grab_import_names/issue_test.go
+++ b/internal/test/issues/issue-grab_import_names/issue_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/doc.go b/internal/test/issues/issue-head-digit-of-httpheader/doc.go
index 63904053bf..83d7ba7dcd 100644
--- a/internal/test/issues/issue-head-digit-of-httpheader/doc.go
+++ b/internal/test/issues/issue-head-digit-of-httpheader/doc.go
@@ -1,3 +1,3 @@
 package headdigitofhttpheader
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go
index 6eadcef68e..61adf94580 100644
--- a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go
+++ b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go
@@ -1,6 +1,6 @@
 // Package headdigitofhttpheader provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package headdigitofhttpheader
 
 type N200ResponseHeaders struct {
diff --git a/internal/test/issues/issue-head-digit-of-operation-id/doc.go b/internal/test/issues/issue-head-digit-of-operation-id/doc.go
index fb08e63e86..c00ee586e9 100644
--- a/internal/test/issues/issue-head-digit-of-operation-id/doc.go
+++ b/internal/test/issues/issue-head-digit-of-operation-id/doc.go
@@ -1,3 +1,3 @@
 package head_digit_of_operation_id
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go
index 00c0844afc..bd9ca74220 100644
--- a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go
+++ b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go
@@ -1,4 +1,4 @@
 // Package head_digit_of_operation_id provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package head_digit_of_operation_id
diff --git a/internal/test/issues/issue-illegal_enum_names/doc.go b/internal/test/issues/issue-illegal_enum_names/doc.go
index d8fb076b49..6670e36d30 100644
--- a/internal/test/issues/issue-illegal_enum_names/doc.go
+++ b/internal/test/issues/issue-illegal_enum_names/doc.go
@@ -1,3 +1,3 @@
 package illegalenumnames
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-illegal_enum_names/issue.gen.go b/internal/test/issues/issue-illegal_enum_names/issue.gen.go
index a24b19da0e..ad3ffa9fea 100644
--- a/internal/test/issues/issue-illegal_enum_names/issue.gen.go
+++ b/internal/test/issues/issue-illegal_enum_names/issue.gen.go
@@ -1,6 +1,6 @@
 // Package illegalenumnames provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package illegalenumnames
 
 import (
diff --git a/internal/test/issues/issue-illegal_enum_names/issue_test.go b/internal/test/issues/issue-illegal_enum_names/issue_test.go
index 3a8b475103..aaf37a4950 100644
--- a/internal/test/issues/issue-illegal_enum_names/issue_test.go
+++ b/internal/test/issues/issue-illegal_enum_names/issue_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
+	"github.com/northvolt/oapi-codegen/v2/pkg/codegen"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/issues/issue-removed-external-ref/config.base.yaml b/internal/test/issues/issue-removed-external-ref/config.base.yaml
index 14faed834b..7939e28b08 100644
--- a/internal/test/issues/issue-removed-external-ref/config.base.yaml
+++ b/internal/test/issues/issue-removed-external-ref/config.base.yaml
@@ -6,7 +6,7 @@ generate:
   strict-server: true
   models: true
 import-mapping:
-  spec-ext.yaml: "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext"
+  spec-ext.yaml: "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext"
 output: gen/spec_base/issue.gen.go
 output-options:
   skip-prune: true
diff --git a/internal/test/issues/issue-removed-external-ref/doc.go b/internal/test/issues/issue-removed-external-ref/doc.go
index 6af4d981ff..79e3d42745 100644
--- a/internal/test/issues/issue-removed-external-ref/doc.go
+++ b/internal/test/issues/issue-removed-external-ref/doc.go
@@ -1,4 +1,4 @@
 package head_digit_of_httpheader
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml
diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go
index 1a1c761002..a6a0839f37 100644
--- a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go
+++ b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go
@@ -1,6 +1,6 @@
 // Package spec_base provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package spec_base
 
 import (
@@ -10,7 +10,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
-	externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext"
+	externalRef0 "github.com/northvolt/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext"
 	strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp"
 )
 
diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go
index 881f8be12b..e9770435cc 100644
--- a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go
+++ b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go
@@ -1,6 +1,6 @@
 // Package spec_ext provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package spec_ext
 
 import (
diff --git a/internal/test/issues/issue1469/doc.go b/internal/test/issues/issue1469/doc.go
index d72f419f61..255b590323 100644
--- a/internal/test/issues/issue1469/doc.go
+++ b/internal/test/issues/issue1469/doc.go
@@ -1,3 +1,3 @@
 package issue1469
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue1469/main.gen.go b/internal/test/issues/issue1469/main.gen.go
index 11f87b0c4f..a2f93f4874 100644
--- a/internal/test/issues/issue1469/main.gen.go
+++ b/internal/test/issues/issue1469/main.gen.go
@@ -1,6 +1,6 @@
 // Package issue1469 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue1469
 
 import (
diff --git a/internal/test/issues/issue193/generate.go b/internal/test/issues/issue193/generate.go
index 3d239ebdcf..55c54aae7a 100644
--- a/internal/test/issues/issue193/generate.go
+++ b/internal/test/issues/issue193/generate.go
@@ -1,3 +1,3 @@
 package issue52
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue193/issue.gen.go b/internal/test/issues/issue193/issue.gen.go
index eec8a25dfc..cb23196ac0 100644
--- a/internal/test/issues/issue193/issue.gen.go
+++ b/internal/test/issues/issue193/issue.gen.go
@@ -1,6 +1,6 @@
 // Package issue52 provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package issue52
 
 import (
diff --git a/internal/test/outputoptions/disabletypealiases/generate.go b/internal/test/outputoptions/disabletypealiases/generate.go
index 8f0dd5b3e3..ef5008aef9 100644
--- a/internal/test/outputoptions/disabletypealiases/generate.go
+++ b/internal/test/outputoptions/disabletypealiases/generate.go
@@ -1,3 +1,3 @@
 package types
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/outputoptions/disabletypealiases/types.gen.go b/internal/test/outputoptions/disabletypealiases/types.gen.go
index f2537cfba5..0eb463b227 100644
--- a/internal/test/outputoptions/disabletypealiases/types.gen.go
+++ b/internal/test/outputoptions/disabletypealiases/types.gen.go
@@ -1,6 +1,6 @@
 // Package types provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package types
 
 // Example defines model for example.
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go
index 4b4d2e44e6..0e88436fa5 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go
@@ -1,3 +1,3 @@
 package tocamelcasewithdigits
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go
index d2a11387d0..a5a875295a 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go
@@ -1,6 +1,6 @@
 // Package tocamelcasewithdigits provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package tocamelcasewithdigits
 
 import (
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go
index 5f65491318..07fd35aa89 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go
@@ -1,3 +1,3 @@
 package tocamelcasewithinitialisms
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go
index 3b2a1fa751..41cd2c1570 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go
@@ -1,6 +1,6 @@
 // Package tocamelcasewithinitialisms provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package tocamelcasewithinitialisms
 
 import (
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go
index a6c179b79d..5befec6f5f 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go
@@ -1,3 +1,3 @@
 package tocamelcase
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go
index 3e4ff389e2..1007dc8c2c 100644
--- a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go
+++ b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go
@@ -1,6 +1,6 @@
 // Package tocamelcase provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package tocamelcase
 
 import (
diff --git a/internal/test/outputoptions/name-normalizer/unset/generate.go b/internal/test/outputoptions/name-normalizer/unset/generate.go
index 84fac60cba..b5fc758b2f 100644
--- a/internal/test/outputoptions/name-normalizer/unset/generate.go
+++ b/internal/test/outputoptions/name-normalizer/unset/generate.go
@@ -1,3 +1,3 @@
 package unset
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml
diff --git a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go
index a2ef05ae8b..e3f2bb6d8c 100644
--- a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go
+++ b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go
@@ -1,6 +1,6 @@
 // Package unset provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package unset
 
 import (
diff --git a/internal/test/parameters/doc.go b/internal/test/parameters/doc.go
index 30d5b502e5..79dd2929b5 100644
--- a/internal/test/parameters/doc.go
+++ b/internal/test/parameters/doc.go
@@ -1,3 +1,3 @@
 package parameters
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml
diff --git a/internal/test/parameters/parameters.gen.go b/internal/test/parameters/parameters.gen.go
index 630770731a..75e98e6995 100644
--- a/internal/test/parameters/parameters.gen.go
+++ b/internal/test/parameters/parameters.gen.go
@@ -1,6 +1,6 @@
 // Package parameters provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package parameters
 
 import (
diff --git a/internal/test/schemas/doc.go b/internal/test/schemas/doc.go
index a4147ee5af..a5966c1c7d 100644
--- a/internal/test/schemas/doc.go
+++ b/internal/test/schemas/doc.go
@@ -1,3 +1,3 @@
 package schemas
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml
diff --git a/internal/test/schemas/schemas.gen.go b/internal/test/schemas/schemas.gen.go
index 09efa4a018..8124e9e558 100644
--- a/internal/test/schemas/schemas.gen.go
+++ b/internal/test/schemas/schemas.gen.go
@@ -1,6 +1,6 @@
 // Package schemas provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package schemas
 
 import (
diff --git a/internal/test/server/doc.go b/internal/test/server/doc.go
index f46abed62f..afa10540f4 100644
--- a/internal/test/server/doc.go
+++ b/internal/test/server/doc.go
@@ -1,3 +1,3 @@
 package server
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml
diff --git a/internal/test/server/server.gen.go b/internal/test/server/server.gen.go
index e360916b3a..412d40dae9 100644
--- a/internal/test/server/server.gen.go
+++ b/internal/test/server/server.gen.go
@@ -1,6 +1,6 @@
 // Package server provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package server
 
 import (
diff --git a/internal/test/strict-server/chi/server.gen.go b/internal/test/strict-server/chi/server.gen.go
index c8c7a09245..0afe9f72fb 100644
--- a/internal/test/strict-server/chi/server.gen.go
+++ b/internal/test/strict-server/chi/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/chi/server.go b/internal/test/strict-server/chi/server.go
index c135a2a445..c44867d5a7 100644
--- a/internal/test/strict-server/chi/server.go
+++ b/internal/test/strict-server/chi/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/chi/types.gen.go b/internal/test/strict-server/chi/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/chi/types.gen.go
+++ b/internal/test/strict-server/chi/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/client/client.gen.go b/internal/test/strict-server/client/client.gen.go
index 5bf1dffb3f..51a9654042 100644
--- a/internal/test/strict-server/client/client.gen.go
+++ b/internal/test/strict-server/client/client.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/client/client.go b/internal/test/strict-server/client/client.go
index 5b350a4884..1fdebbc880 100644
--- a/internal/test/strict-server/client/client.go
+++ b/internal/test/strict-server/client/client.go
@@ -1,3 +1,3 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml
 
 package api
diff --git a/internal/test/strict-server/echo/server.gen.go b/internal/test/strict-server/echo/server.gen.go
index f07dfa5e46..2f6aa7f18c 100644
--- a/internal/test/strict-server/echo/server.gen.go
+++ b/internal/test/strict-server/echo/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/echo/server.go b/internal/test/strict-server/echo/server.go
index c135a2a445..c44867d5a7 100644
--- a/internal/test/strict-server/echo/server.go
+++ b/internal/test/strict-server/echo/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/echo/types.gen.go b/internal/test/strict-server/echo/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/echo/types.gen.go
+++ b/internal/test/strict-server/echo/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/fiber/server.gen.go b/internal/test/strict-server/fiber/server.gen.go
index b15d923fd0..adc3103360 100644
--- a/internal/test/strict-server/fiber/server.gen.go
+++ b/internal/test/strict-server/fiber/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/fiber/server.go b/internal/test/strict-server/fiber/server.go
index c135a2a445..c44867d5a7 100644
--- a/internal/test/strict-server/fiber/server.go
+++ b/internal/test/strict-server/fiber/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/fiber/types.gen.go b/internal/test/strict-server/fiber/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/fiber/types.gen.go
+++ b/internal/test/strict-server/fiber/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/gin/server.gen.go b/internal/test/strict-server/gin/server.gen.go
index 21f9f32763..85928a0aec 100644
--- a/internal/test/strict-server/gin/server.gen.go
+++ b/internal/test/strict-server/gin/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/gin/server.go b/internal/test/strict-server/gin/server.go
index c135a2a445..c44867d5a7 100644
--- a/internal/test/strict-server/gin/server.go
+++ b/internal/test/strict-server/gin/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/gin/types.gen.go b/internal/test/strict-server/gin/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/gin/types.gen.go
+++ b/internal/test/strict-server/gin/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/gorilla/server.gen.go b/internal/test/strict-server/gorilla/server.gen.go
index c6b29393df..b4230be30c 100644
--- a/internal/test/strict-server/gorilla/server.gen.go
+++ b/internal/test/strict-server/gorilla/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/gorilla/server.go b/internal/test/strict-server/gorilla/server.go
index 5c5d7c9e77..05b7552b97 100644
--- a/internal/test/strict-server/gorilla/server.go
+++ b/internal/test/strict-server/gorilla/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/gorilla/types.gen.go b/internal/test/strict-server/gorilla/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/gorilla/types.gen.go
+++ b/internal/test/strict-server/gorilla/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/iris/server.gen.go b/internal/test/strict-server/iris/server.gen.go
index 7f224b3b37..e460c31325 100644
--- a/internal/test/strict-server/iris/server.gen.go
+++ b/internal/test/strict-server/iris/server.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/iris/server.go b/internal/test/strict-server/iris/server.go
index c0ab4c7700..d8e1e563d5 100644
--- a/internal/test/strict-server/iris/server.go
+++ b/internal/test/strict-server/iris/server.go
@@ -1,5 +1,5 @@
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/iris/types.gen.go b/internal/test/strict-server/iris/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/iris/types.gen.go
+++ b/internal/test/strict-server/iris/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/stdhttp/go.mod b/internal/test/strict-server/stdhttp/go.mod
index 24161ac4e0..f968376183 100644
--- a/internal/test/strict-server/stdhttp/go.mod
+++ b/internal/test/strict-server/stdhttp/go.mod
@@ -1,15 +1,15 @@
-module github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/stdhttp
+module github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/stdhttp
 
 go 1.22
 
-replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../../
+replace github.com/northvolt/oapi-codegen/v2 => ../../../../
 
-replace github.com/oapi-codegen/oapi-codegen/v2/internal/test => ../..
+replace github.com/northvolt/oapi-codegen/v2/internal/test => ../..
 
 require (
 	github.com/getkin/kin-openapi v0.127.0
-	github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
-	github.com/oapi-codegen/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2 v2.0.0-00010101000000-000000000000
+	github.com/northvolt/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000
 	github.com/oapi-codegen/runtime v1.1.0
 	github.com/oapi-codegen/testutil v1.1.0
 	github.com/stretchr/testify v1.9.0
diff --git a/internal/test/strict-server/stdhttp/server.gen.go b/internal/test/strict-server/stdhttp/server.gen.go
index 28c36a7ac7..2830608f60 100644
--- a/internal/test/strict-server/stdhttp/server.gen.go
+++ b/internal/test/strict-server/stdhttp/server.gen.go
@@ -2,7 +2,7 @@
 
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 import (
diff --git a/internal/test/strict-server/stdhttp/server.go b/internal/test/strict-server/stdhttp/server.go
index a142a6b813..bf6d98c44b 100644
--- a/internal/test/strict-server/stdhttp/server.go
+++ b/internal/test/strict-server/stdhttp/server.go
@@ -1,7 +1,7 @@
 //go:build go1.22
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml
+//go:generate go run github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml
 
 package api
 
diff --git a/internal/test/strict-server/stdhttp/std_strict_test.go b/internal/test/strict-server/stdhttp/std_strict_test.go
index 40d362a54a..482fc85bec 100644
--- a/internal/test/strict-server/stdhttp/std_strict_test.go
+++ b/internal/test/strict-server/stdhttp/std_strict_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client"
+	clientAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/client"
 	"github.com/oapi-codegen/runtime"
 	"github.com/oapi-codegen/testutil"
 )
diff --git a/internal/test/strict-server/stdhttp/tools/tools.go b/internal/test/strict-server/stdhttp/tools/tools.go
index 8615cb4c57..1a90dde50c 100644
--- a/internal/test/strict-server/stdhttp/tools/tools.go
+++ b/internal/test/strict-server/stdhttp/tools/tools.go
@@ -4,5 +4,5 @@
 package tools
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/northvolt/oapi-codegen/v2/cmd/oapi-codegen"
 )
diff --git a/internal/test/strict-server/stdhttp/types.gen.go b/internal/test/strict-server/stdhttp/types.gen.go
index 6682c1acab..e0bf2ab08c 100644
--- a/internal/test/strict-server/stdhttp/types.gen.go
+++ b/internal/test/strict-server/stdhttp/types.gen.go
@@ -1,6 +1,6 @@
 // Package api provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
+// Code generated by github.com/northvolt/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT.
 package api
 
 // Example defines model for example.
diff --git a/internal/test/strict-server/strict_test.go b/internal/test/strict-server/strict_test.go
index 0ae094df02..a1d5568ab0 100644
--- a/internal/test/strict-server/strict_test.go
+++ b/internal/test/strict-server/strict_test.go
@@ -19,12 +19,12 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
 
-	chiAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/chi"
-	clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client"
-	echoAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/echo"
-	fiberAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/fiber"
-	ginAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/gin"
-	irisAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/iris"
+	chiAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/chi"
+	clientAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/client"
+	echoAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/echo"
+	fiberAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/fiber"
+	ginAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/gin"
+	irisAPI "github.com/northvolt/oapi-codegen/v2/internal/test/strict-server/iris"
 
 	"github.com/oapi-codegen/runtime"
 	"github.com/oapi-codegen/testutil"
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
index 632f649e23..f957fe1a23 100644
--- a/pkg/codegen/codegen.go
+++ b/pkg/codegen/codegen.go
@@ -33,7 +33,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 	"golang.org/x/tools/imports"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 // Embed the templates directory
diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go
index 7b22faed01..a2e036ff89 100644
--- a/pkg/codegen/codegen_test.go
+++ b/pkg/codegen/codegen_test.go
@@ -9,13 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 const (
 	remoteRefFile = `https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/master/examples/petstore-expanded` +
 		`/petstore-expanded.yaml`
-	remoteRefImport = `github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded`
+	remoteRefImport = `github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded`
 )
 
 func TestExampleOpenAPICodeGeneration(t *testing.T) {
@@ -198,7 +198,7 @@ func TestRemoteExternalReference(t *testing.T) {
 	assert.Contains(t, code, "package api")
 
 	// Check import
-	assert.Contains(t, code, `externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded"`)
+	assert.Contains(t, code, `externalRef0 "github.com/northvolt/oapi-codegen/v2/examples/petstore-expanded"`)
 
 	// Check generated oneOf structure:
 	assert.Contains(t, code, `
diff --git a/pkg/codegen/merge_schemas.go b/pkg/codegen/merge_schemas.go
index 04e7b2fa2b..070e7b1ded 100644
--- a/pkg/codegen/merge_schemas.go
+++ b/pkg/codegen/merge_schemas.go
@@ -10,28 +10,23 @@ import (
 
 // MergeSchemas merges all the fields in the schemas supplied into one giant schema.
 // The idea is that we merge all fields together into one schema.
-func MergeSchemas(allOf []*openapi3.SchemaRef, path []string) (Schema, error) {
+func MergeSchemas(schema *openapi3.Schema, path []string) (Schema, error) {
 	// If someone asked for the old way, for backward compatibility, return the
 	// old style result.
 	if globalState.options.Compatibility.OldMergeSchemas {
-		return mergeSchemasV1(allOf, path)
+		return mergeSchemasV1(schema.AllOf, path)
 	}
-	return mergeSchemas(allOf, path)
+	return mergeSchemas(schema, path)
 }
 
-func mergeSchemas(allOf []*openapi3.SchemaRef, path []string) (Schema, error) {
+func mergeSchemas(baseSchema *openapi3.Schema, path []string) (Schema, error) {
+	allOf := baseSchema.AllOf
 	n := len(allOf)
 
-	if n == 1 {
-		return GenerateGoSchema(allOf[0], path)
-	}
-
-	schema, err := valueWithPropagatedRef(allOf[0])
-	if err != nil {
-		return Schema{}, err
-	}
+	schema := *baseSchema
+	schema.AllOf = nil
 
-	for i := 1; i < n; i++ {
+	for i := 0; i < n; i++ {
 		var err error
 		oneOfSchema, err := valueWithPropagatedRef(allOf[i])
 		if err != nil {
diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go
index 3b0f130162..426745ffc1 100644
--- a/pkg/codegen/operations.go
+++ b/pkg/codegen/operations.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 type ParameterDefinition struct {
diff --git a/pkg/codegen/schema.go b/pkg/codegen/schema.go
index 2cef0023fe..45de540f57 100644
--- a/pkg/codegen/schema.go
+++ b/pkg/codegen/schema.go
@@ -281,7 +281,7 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 	// so that in a RESTful paradigm, the Create operation can return
 	// (object, id), so that other operations can refer to (id)
 	if schema.AllOf != nil {
-		mergedSchema, err := MergeSchemas(schema.AllOf, path)
+		mergedSchema, err := MergeSchemas(schema, path)
 		if err != nil {
 			return Schema{}, fmt.Errorf("error merging schemas: %w", err)
 		}
diff --git a/pkg/codegen/template_helpers.go b/pkg/codegen/template_helpers.go
index b9efe2cf45..a9fac64d5c 100644
--- a/pkg/codegen/template_helpers.go
+++ b/pkg/codegen/template_helpers.go
@@ -23,7 +23,7 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/util"
+	"github.com/northvolt/oapi-codegen/v2/pkg/util"
 )
 
 const (