diff --git a/Makefile b/Makefile
index 6e6eb4a..4f5b403 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULE = go.linka.cloud/grpc
+MODULE = go.linka.cloud/grpc-toolkit
 
 
 PROTO_BASE_PATH = $(PWD)
diff --git a/README.md b/README.md
index 5fd50db..31be4a9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# gRPC 
+# gRPC-toolkit
 
 A utility module, largely taken from the [go-micro](https://github.com/micro/go-micro) patterns (and a good amount of code too...) 
 with pure gRPC ecosystem modules.
diff --git a/client/client.go b/client/client.go
index 6e4702c..8087c3f 100644
--- a/client/client.go
+++ b/client/client.go
@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/resolver"
 
-	"go.linka.cloud/grpc/registry/noop"
+	"go.linka.cloud/grpc-toolkit/registry/noop"
 )
 
 type Client interface {
diff --git a/client/options.go b/client/options.go
index d88c3d4..5b04e5b 100644
--- a/client/options.go
+++ b/client/options.go
@@ -5,8 +5,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/registry"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/registry"
 )
 
 type Options interface {
diff --git a/config/file/config.go b/config/file/config.go
index 0a7e15b..10e5949 100644
--- a/config/file/config.go
+++ b/config/file/config.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/fsnotify/fsnotify"
 
-	"go.linka.cloud/grpc/config"
-	"go.linka.cloud/grpc/logger"
+	"go.linka.cloud/grpc-toolkit/config"
+	"go.linka.cloud/grpc-toolkit/logger"
 )
 
 func NewConfig(path string) (config.Config, error) {
diff --git a/config/file/config_test.go b/config/file/config_test.go
index 7573288..0d4f11e 100644
--- a/config/file/config_test.go
+++ b/config/file/config_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.linka.cloud/grpc/config"
+	"go.linka.cloud/grpc-toolkit/config"
 )
 
 func newConfigFile(t *testing.T) (config.Config, string, func()) {
diff --git a/example/example.go b/example/example.go
index e5338bc..d1916d0 100644
--- a/example/example.go
+++ b/example/example.go
@@ -19,15 +19,15 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/descriptorpb"
 
-	"go.linka.cloud/grpc/client"
-	"go.linka.cloud/grpc/interceptors/auth"
-	"go.linka.cloud/grpc/interceptors/ban"
-	"go.linka.cloud/grpc/interceptors/defaulter"
-	"go.linka.cloud/grpc/interceptors/iface"
-	metrics2 "go.linka.cloud/grpc/interceptors/metrics"
-	validation2 "go.linka.cloud/grpc/interceptors/validation"
-	"go.linka.cloud/grpc/logger"
-	"go.linka.cloud/grpc/service"
+	"go.linka.cloud/grpc-toolkit/client"
+	"go.linka.cloud/grpc-toolkit/interceptors/auth"
+	"go.linka.cloud/grpc-toolkit/interceptors/ban"
+	"go.linka.cloud/grpc-toolkit/interceptors/defaulter"
+	"go.linka.cloud/grpc-toolkit/interceptors/iface"
+	metrics2 "go.linka.cloud/grpc-toolkit/interceptors/metrics"
+	validation2 "go.linka.cloud/grpc-toolkit/interceptors/validation"
+	"go.linka.cloud/grpc-toolkit/logger"
+	"go.linka.cloud/grpc-toolkit/service"
 )
 
 var (
diff --git a/example/example.proto b/example/example.proto
index f7eadf2..5dd05ed 100644
--- a/example/example.proto
+++ b/example/example.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package helloworld;
 
-option go_package = "go.linka.cloud/grpc/example;main";
+option go_package = "go.linka.cloud/grpc-toolkit/example;main";
 
 import "google/api/annotations.proto";
 import "validate/validate.proto";
diff --git a/go.mod b/go.mod
index 4d5daee..9a15cbf 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module go.linka.cloud/grpc
+module go.linka.cloud/grpc-toolkit
 
 go 1.20
 
diff --git a/interceptors/auth/basic.go b/interceptors/auth/basic.go
index c61d6f6..5bed4c3 100644
--- a/interceptors/auth/basic.go
+++ b/interceptors/auth/basic.go
@@ -7,9 +7,9 @@ import (
 
 	grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
 
-	"go.linka.cloud/grpc/errors"
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/interceptors/metadata"
+	"go.linka.cloud/grpc-toolkit/errors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors/metadata"
 )
 
 func BasicAuth(user, password string) string {
diff --git a/interceptors/auth/interceptors.go b/interceptors/auth/interceptors.go
index 1f311e0..051d1b5 100644
--- a/interceptors/auth/interceptors.go
+++ b/interceptors/auth/interceptors.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/anypb"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 func ChainedAuthFuncs(fn ...grpc_auth.AuthFunc) grpc_auth.AuthFunc {
diff --git a/interceptors/auth/interceptors_test.go b/interceptors/auth/interceptors_test.go
index 6327fe9..f846b3a 100644
--- a/interceptors/auth/interceptors_test.go
+++ b/interceptors/auth/interceptors_test.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
-	"go.linka.cloud/grpc/errors"
+	"go.linka.cloud/grpc-toolkit/errors"
 )
 
 func TestNotProtectedOnly(t *testing.T) {
diff --git a/interceptors/auth/token.go b/interceptors/auth/token.go
index 485dcfa..69681da 100644
--- a/interceptors/auth/token.go
+++ b/interceptors/auth/token.go
@@ -5,8 +5,8 @@ import (
 
 	grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
 
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/interceptors/metadata"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors/metadata"
 )
 
 type TokenValidator func(ctx context.Context, token string) (context.Context, error)
diff --git a/interceptors/auth/x509.go b/interceptors/auth/x509.go
index 2aae089..e1361ab 100644
--- a/interceptors/auth/x509.go
+++ b/interceptors/auth/x509.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/peer"
 
-	"go.linka.cloud/grpc/errors"
+	"go.linka.cloud/grpc-toolkit/errors"
 )
 
 type X509Validator func(ctx context.Context, sans []string) (context.Context, error)
diff --git a/interceptors/ban/ban.go b/interceptors/ban/ban.go
index b5404e4..c65adaa 100644
--- a/interceptors/ban/ban.go
+++ b/interceptors/ban/ban.go
@@ -8,8 +8,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/logger"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/logger"
 )
 
 type ban struct {
diff --git a/interceptors/chain/chain.go b/interceptors/chain/chain.go
index 54cf52b..138f1f8 100644
--- a/interceptors/chain/chain.go
+++ b/interceptors/chain/chain.go
@@ -4,7 +4,7 @@ import (
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type Option func(*chain)
diff --git a/interceptors/defaulter/interceptors.go b/interceptors/defaulter/interceptors.go
index 5098592..8c797c9 100644
--- a/interceptors/defaulter/interceptors.go
+++ b/interceptors/defaulter/interceptors.go
@@ -5,7 +5,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type interceptor struct{}
diff --git a/interceptors/iface/interceptors.go b/interceptors/iface/interceptors.go
index 2c1f8c7..5b8022f 100644
--- a/interceptors/iface/interceptors.go
+++ b/interceptors/iface/interceptors.go
@@ -5,7 +5,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type UnaryInterceptor interface {
diff --git a/interceptors/metadata/forward.go b/interceptors/metadata/forward.go
index 813926c..10c9374 100644
--- a/interceptors/metadata/forward.go
+++ b/interceptors/metadata/forward.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 func NewForwardInterceptors() interceptors.ServerInterceptors {
diff --git a/interceptors/metadata/metadata.go b/interceptors/metadata/metadata.go
index 297df47..47412a9 100644
--- a/interceptors/metadata/metadata.go
+++ b/interceptors/metadata/metadata.go
@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 func NewInterceptors(pairs ...string) interceptors.Interceptors {
diff --git a/interceptors/metrics/interceptors.go b/interceptors/metrics/interceptors.go
index 9644d2f..c426451 100644
--- a/interceptors/metrics/interceptors.go
+++ b/interceptors/metrics/interceptors.go
@@ -5,8 +5,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/service"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/service"
 )
 
 type Registerer interface {
diff --git a/interceptors/noop/interceptors.go b/interceptors/noop/interceptors.go
index 0fd5876..f29a8ec 100644
--- a/interceptors/noop/interceptors.go
+++ b/interceptors/noop/interceptors.go
@@ -5,7 +5,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 func New() interceptors.Interceptors {
diff --git a/interceptors/recovery/interceptors.go b/interceptors/recovery/interceptors.go
index 776b1ed..a302013 100644
--- a/interceptors/recovery/interceptors.go
+++ b/interceptors/recovery/interceptors.go
@@ -4,7 +4,7 @@ import (
 	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 func NewInterceptors(opts ...grpc_recovery.Option) interceptors.ServerInterceptors {
diff --git a/interceptors/sentry/interceptors.go b/interceptors/sentry/interceptors.go
index cb7191b..ee0e56c 100644
--- a/interceptors/sentry/interceptors.go
+++ b/interceptors/sentry/interceptors.go
@@ -5,7 +5,7 @@ import (
 
 	grpc_sentry "github.com/johnbellone/grpc-middleware-sentry"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type interceptor struct {
diff --git a/interceptors/tracing/interceptors.go b/interceptors/tracing/interceptors.go
index 5c44c4c..0a2a369 100644
--- a/interceptors/tracing/interceptors.go
+++ b/interceptors/tracing/interceptors.go
@@ -5,7 +5,7 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type tracing struct {
diff --git a/interceptors/validation/validation.go b/interceptors/validation/validation.go
index db7603b..7d26eea 100644
--- a/interceptors/validation/validation.go
+++ b/interceptors/validation/validation.go
@@ -6,8 +6,8 @@ import (
 	"google.golang.org/genproto/googleapis/rpc/errdetails"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/errors"
-	"go.linka.cloud/grpc/interceptors"
+	"go.linka.cloud/grpc-toolkit/errors"
+	"go.linka.cloud/grpc-toolkit/interceptors"
 )
 
 type validatorAll interface {
diff --git a/registry/mdns/mdns.go b/registry/mdns/mdns.go
index 7f33abf..791525f 100644
--- a/registry/mdns/mdns.go
+++ b/registry/mdns/mdns.go
@@ -17,8 +17,8 @@ import (
 	"github.com/google/uuid"
 	"google.golang.org/grpc/resolver"
 
-	"go.linka.cloud/grpc/registry"
-	resolver2 "go.linka.cloud/grpc/resolver"
+	"go.linka.cloud/grpc-toolkit/registry"
+	resolver2 "go.linka.cloud/grpc-toolkit/resolver"
 )
 
 var (
diff --git a/registry/mdns/mdns_test.go b/registry/mdns/mdns_test.go
index 0c077b3..3fdcdc3 100644
--- a/registry/mdns/mdns_test.go
+++ b/registry/mdns/mdns_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"go.linka.cloud/grpc/registry"
+	"go.linka.cloud/grpc-toolkit/registry"
 )
 
 func TestRegistry(t *testing.T) {
diff --git a/registry/noop/registry.go b/registry/noop/registry.go
index 7938cba..f5fd937 100644
--- a/registry/noop/registry.go
+++ b/registry/noop/registry.go
@@ -5,8 +5,8 @@ import (
 
 	"google.golang.org/grpc/resolver"
 
-	"go.linka.cloud/grpc/registry"
-	resolver2 "go.linka.cloud/grpc/resolver"
+	"go.linka.cloud/grpc-toolkit/registry"
+	resolver2 "go.linka.cloud/grpc-toolkit/resolver"
 )
 
 func New() registry.Registry {
diff --git a/resolver/resolver.go b/resolver/resolver.go
index bbf9e29..1c179da 100644
--- a/resolver/resolver.go
+++ b/resolver/resolver.go
@@ -5,7 +5,7 @@ import (
 
 	"google.golang.org/grpc/resolver"
 
-	"go.linka.cloud/grpc/registry"
+	"go.linka.cloud/grpc-toolkit/registry"
 )
 
 func New(reg registry.Registry) resolver.Builder {
diff --git a/service/interceptors.go b/service/interceptors.go
index e4bf849..d9c26a8 100644
--- a/service/interceptors.go
+++ b/service/interceptors.go
@@ -1,8 +1,8 @@
 package service
 
 import (
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/interceptors/metadata"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/interceptors/metadata"
 )
 
 func md(opts *options) interceptors.Interceptors {
diff --git a/service/options.go b/service/options.go
index c6dd810..0be453c 100644
--- a/service/options.go
+++ b/service/options.go
@@ -15,11 +15,11 @@ import (
 	"github.com/rs/cors"
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/certs"
-	"go.linka.cloud/grpc/interceptors"
-	"go.linka.cloud/grpc/registry"
-	"go.linka.cloud/grpc/transport"
-	"go.linka.cloud/grpc/utils/addr"
+	"go.linka.cloud/grpc-toolkit/certs"
+	"go.linka.cloud/grpc-toolkit/interceptors"
+	"go.linka.cloud/grpc-toolkit/registry"
+	"go.linka.cloud/grpc-toolkit/transport"
+	"go.linka.cloud/grpc-toolkit/utils/addr"
 )
 
 var _ Options = (*options)(nil)
diff --git a/service/register.go b/service/register.go
index 39b6b7c..08c2c45 100644
--- a/service/register.go
+++ b/service/register.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 	"time"
 
-	"go.linka.cloud/grpc/registry"
-	"go.linka.cloud/grpc/utils/addr"
-	"go.linka.cloud/grpc/utils/backoff"
-	net2 "go.linka.cloud/grpc/utils/net"
+	"go.linka.cloud/grpc-toolkit/registry"
+	"go.linka.cloud/grpc-toolkit/utils/addr"
+	"go.linka.cloud/grpc-toolkit/utils/backoff"
+	net2 "go.linka.cloud/grpc-toolkit/utils/net"
 )
 
 func (s *service) register() error {
diff --git a/service/service.go b/service/service.go
index d4b8a1d..b729646 100644
--- a/service/service.go
+++ b/service/service.go
@@ -27,9 +27,9 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 	greflect "google.golang.org/grpc/reflection"
 
-	"go.linka.cloud/grpc/logger"
-	"go.linka.cloud/grpc/registry"
-	"go.linka.cloud/grpc/registry/noop"
+	"go.linka.cloud/grpc-toolkit/logger"
+	"go.linka.cloud/grpc-toolkit/registry"
+	"go.linka.cloud/grpc-toolkit/registry/noop"
 )
 
 type Service interface {
diff --git a/service/web.go b/service/web.go
index 6a4bb85..6d17fff 100644
--- a/service/web.go
+++ b/service/web.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
 
-	"go.linka.cloud/grpc/react"
+	"go.linka.cloud/grpc-toolkit/react"
 )
 
 var defaultWebOptions = []grpcweb.Option{
diff --git a/transport/grpc/grpc.go b/transport/grpc/grpc.go
index 6c9cda3..40d1a1f 100644
--- a/transport/grpc/grpc.go
+++ b/transport/grpc/grpc.go
@@ -3,7 +3,7 @@ package grpc
 import (
 	"google.golang.org/grpc"
 
-	"go.linka.cloud/grpc/transport"
+	"go.linka.cloud/grpc-toolkit/transport"
 )
 
 var (
diff --git a/transport/inproc/inproc.go b/transport/inproc/inproc.go
index fef51ef..08ce11f 100644
--- a/transport/inproc/inproc.go
+++ b/transport/inproc/inproc.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/fullstorydev/grpchan/inprocgrpc"
 
-	"go.linka.cloud/grpc/transport"
+	"go.linka.cloud/grpc-toolkit/transport"
 )
 
 var (