diff --git a/client.go b/client.go
index 5b6c65e..82923f2 100644
--- a/client.go
+++ b/client.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Dialer abstracts the ability to open a connection to a Pilot overlay address.
diff --git a/go.mod b/go.mod
index 695965b..ad74349 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,8 @@ module github.com/pilot-protocol/nameserver
 
 go 1.25.10
 
-require (
-	github.com/TeoSlayer/pilotprotocol v0.0.0
-	github.com/pilot-protocol/common v0.1.0
-)
+require github.com/pilot-protocol/common v0.2.0
 
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/go.sum b/go.sum
index f2dc86d..e69de29 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +0,0 @@
-github.com/pilot-protocol/common v0.1.0 h1:m8mZZATgeBiFoqhWXPnskw2u0lNkWxHp0IagZK35V1g=
-github.com/pilot-protocol/common v0.1.0/go.mod h1:4YZWHK5nhM+4RLmYTspLxxAFbyBII7yzQDAHq3Ul2ck=
diff --git a/records.go b/records.go
index c0552c7..c4c9e2c 100644
--- a/records.go
+++ b/records.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/pilot-protocol/common/fsutil"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Record types
diff --git a/server.go b/server.go
index e915cb8..6068b18 100644
--- a/server.go
+++ b/server.go
@@ -7,8 +7,8 @@ import (
 	"log/slog"
 	"net"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/coreapi"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // PortListener abstracts the ability to listen on a Pilot overlay port.
diff --git a/service.go b/service.go
index 4881d04..4e01f08 100644
--- a/service.go
+++ b/service.go
@@ -8,7 +8,7 @@ package nameserver
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is the L11 plugin lifecycle adapter for the nameserver. The
diff --git a/service_disabled.go b/service_disabled.go
index 606253a..e992120 100644
--- a/service_disabled.go
+++ b/service_disabled.go
@@ -14,7 +14,7 @@ package nameserver
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is a no-op replacement for the (today-unused) plugin
diff --git a/wire.go b/wire.go
index a28e91f..1fa4087 100644
--- a/wire.go
+++ b/wire.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // Wire protocol for the nameserver. Plain text, newline-delimited.
diff --git a/zz_case_sensitivity_test.go b/zz_case_sensitivity_test.go
index c90633d..2a82b75 100644
--- a/zz_case_sensitivity_test.go
+++ b/zz_case_sensitivity_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/pilot-protocol/nameserver"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 func TestRecordStoreLookupCaseInsensitive(t *testing.T) {
diff --git a/zz_coverage_test.go b/zz_coverage_test.go
index 04f6b80..0903be4 100644
--- a/zz_coverage_test.go
+++ b/zz_coverage_test.go
@@ -13,8 +13,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/coreapi"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/zz_e2e_test.go b/zz_e2e_test.go
index fbd58c6..130b1bf 100644
--- a/zz_e2e_test.go
+++ b/zz_e2e_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // fakeListener implements PortListener using net.Listen on 127.0.0.1.
diff --git a/zz_fuzz_nameserver_records_test.go b/zz_fuzz_nameserver_records_test.go
index cbd2194..2af7520 100644
--- a/zz_fuzz_nameserver_records_test.go
+++ b/zz_fuzz_nameserver_records_test.go
@@ -5,7 +5,7 @@ package nameserver_test
 import (
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/nameserver"
 )
 
diff --git a/zz_fuzz_nameserver_test.go b/zz_fuzz_nameserver_test.go
index 2048ad6..9356b47 100644
--- a/zz_fuzz_nameserver_test.go
+++ b/zz_fuzz_nameserver_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/nameserver"
 )
 
diff --git a/zz_nameserver_test.go b/zz_nameserver_test.go
index f7faa92..4a8cdc4 100644
--- a/zz_nameserver_test.go
+++ b/zz_nameserver_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/nameserver"
 )
 
diff --git a/zz_ttl_persistence_test.go b/zz_ttl_persistence_test.go
index b7de597..3920655 100644
--- a/zz_ttl_persistence_test.go
+++ b/zz_ttl_persistence_test.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/pilot-protocol/nameserver"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 func TestRecordStoreTTLSurvivesRestart(t *testing.T) {