diff --git a/hscontrol/acls.go b/hscontrol/acls.go
index a771df50..1f411a4b 100644
--- a/hscontrol/acls.go
+++ b/hscontrol/acls.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/acls_test.go b/hscontrol/acls_test.go
index d6e10a73..a065bf7d 100644
--- a/hscontrol/acls_test.go
+++ b/hscontrol/acls_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"errors"
diff --git a/hscontrol/acls_types.go b/hscontrol/acls_types.go
index b98b2d2a..0e553515 100644
--- a/hscontrol/acls_types.go
+++ b/hscontrol/acls_types.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/api.go b/hscontrol/api.go
index 308bc281..f8b1496f 100644
--- a/hscontrol/api.go
+++ b/hscontrol/api.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"bytes"
diff --git a/hscontrol/api_common.go b/hscontrol/api_common.go
index 7905c29d..3dd65ac6 100644
--- a/hscontrol/api_common.go
+++ b/hscontrol/api_common.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"time"
diff --git a/hscontrol/api_key.go b/hscontrol/api_key.go
index ae19eb9c..6382a331 100644
--- a/hscontrol/api_key.go
+++ b/hscontrol/api_key.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"fmt"
diff --git a/hscontrol/api_key_test.go b/hscontrol/api_key_test.go
index 2ddbbbc0..fd4fa00d 100644
--- a/hscontrol/api_key_test.go
+++ b/hscontrol/api_key_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"time"
diff --git a/hscontrol/app.go b/hscontrol/app.go
index 79784ba1..430c8ab4 100644
--- a/hscontrol/app.go
+++ b/hscontrol/app.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/app_test.go b/hscontrol/app_test.go
index 5f23fd2b..7d3907d3 100644
--- a/hscontrol/app_test.go
+++ b/hscontrol/app_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"net/netip"
diff --git a/hscontrol/config.go b/hscontrol/config.go
index b97ba04c..0e83a1c2 100644
--- a/hscontrol/config.go
+++ b/hscontrol/config.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"errors"
diff --git a/hscontrol/db.go b/hscontrol/db.go
index fb5c5c35..14df4b3b 100644
--- a/hscontrol/db.go
+++ b/hscontrol/db.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/derp.go b/hscontrol/derp.go
index a447da78..fbc366a9 100644
--- a/hscontrol/derp.go
+++ b/hscontrol/derp.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/derp_server.go b/hscontrol/derp_server.go
index c4e0d65f..9ca6eee5 100644
--- a/hscontrol/derp_server.go
+++ b/hscontrol/derp_server.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/dns.go b/hscontrol/dns.go
index da1a95d0..72c5b03c 100644
--- a/hscontrol/dns.go
+++ b/hscontrol/dns.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"fmt"
diff --git a/hscontrol/dns_test.go b/hscontrol/dns_test.go
index eb96bbe9..b8257219 100644
--- a/hscontrol/dns_test.go
+++ b/hscontrol/dns_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"fmt"
diff --git a/hscontrol/grpcv1.go b/hscontrol/grpcv1.go
index 2be047bb..a65a3805 100644
--- a/hscontrol/grpcv1.go
+++ b/hscontrol/grpcv1.go
@@ -1,5 +1,5 @@
 // nolint
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/grpcv1_test.go b/hscontrol/grpcv1_test.go
index e48ae1ef..1d87bfe0 100644
--- a/hscontrol/grpcv1_test.go
+++ b/hscontrol/grpcv1_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import "testing"
 
diff --git a/hscontrol/handler_legacy.go b/hscontrol/handler_legacy.go
index 8911d430..bb94b1e5 100644
--- a/hscontrol/handler_legacy.go
+++ b/hscontrol/handler_legacy.go
@@ -1,6 +1,6 @@
 //go:build ts2019
 
-package headscale
+package hscontrol
 
 import (
 	"net/http"
diff --git a/hscontrol/handler_placeholder.go b/hscontrol/handler_placeholder.go
index 25fe9c65..73d17c49 100644
--- a/hscontrol/handler_placeholder.go
+++ b/hscontrol/handler_placeholder.go
@@ -1,6 +1,6 @@
 //go:build !ts2019
 
-package headscale
+package hscontrol
 
 import "github.com/gorilla/mux"
 
diff --git a/hscontrol/integration_cli_test.go b/hscontrol/integration_cli_test.go
index d6d32569..feac0001 100644
--- a/hscontrol/integration_cli_test.go
+++ b/hscontrol/integration_cli_test.go
@@ -1,5 +1,5 @@
 // nolint
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/integration_common_test.go b/hscontrol/integration_common_test.go
index edc0280a..86ba6488 100644
--- a/hscontrol/integration_common_test.go
+++ b/hscontrol/integration_common_test.go
@@ -1,5 +1,5 @@
 // nolint
-package headscale
+package hscontrol
 
 import (
 	"bytes"
diff --git a/hscontrol/machine.go b/hscontrol/machine.go
index 9b775a47..9f04d8ce 100644
--- a/hscontrol/machine.go
+++ b/hscontrol/machine.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"database/sql/driver"
diff --git a/hscontrol/machine_test.go b/hscontrol/machine_test.go
index 7fc641af..87ca7600 100644
--- a/hscontrol/machine_test.go
+++ b/hscontrol/machine_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"fmt"
diff --git a/hscontrol/matcher.go b/hscontrol/matcher.go
index 1a186c4c..3b4670e8 100644
--- a/hscontrol/matcher.go
+++ b/hscontrol/matcher.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"fmt"
diff --git a/hscontrol/matcher_test.go b/hscontrol/matcher_test.go
index 03b585c4..fb0e9b07 100644
--- a/hscontrol/matcher_test.go
+++ b/hscontrol/matcher_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"net/netip"
diff --git a/hscontrol/metrics.go b/hscontrol/metrics.go
index f1f86909..087ce302 100644
--- a/hscontrol/metrics.go
+++ b/hscontrol/metrics.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/hscontrol/noise.go b/hscontrol/noise.go
index 9cc489ae..f938dfe5 100644
--- a/hscontrol/noise.go
+++ b/hscontrol/noise.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/binary"
diff --git a/hscontrol/oidc.go b/hscontrol/oidc.go
index 5aa3ba62..332ce099 100644
--- a/hscontrol/oidc.go
+++ b/hscontrol/oidc.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"bytes"
diff --git a/hscontrol/platform_config.go b/hscontrol/platform_config.go
index b23133e7..0404f546 100644
--- a/hscontrol/platform_config.go
+++ b/hscontrol/platform_config.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"bytes"
diff --git a/hscontrol/preauth_keys.go b/hscontrol/preauth_keys.go
index 3222c71d..6cff90b0 100644
--- a/hscontrol/preauth_keys.go
+++ b/hscontrol/preauth_keys.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"crypto/rand"
diff --git a/hscontrol/preauth_keys_test.go b/hscontrol/preauth_keys_test.go
index 697144fe..bd383cfd 100644
--- a/hscontrol/preauth_keys_test.go
+++ b/hscontrol/preauth_keys_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"time"
diff --git a/hscontrol/protocol_common.go b/hscontrol/protocol_common.go
index 2a30046f..97da464b 100644
--- a/hscontrol/protocol_common.go
+++ b/hscontrol/protocol_common.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/protocol_common_poll.go b/hscontrol/protocol_common_poll.go
index 09df6309..f267c999 100644
--- a/hscontrol/protocol_common_poll.go
+++ b/hscontrol/protocol_common_poll.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/protocol_common_utils.go b/hscontrol/protocol_common_utils.go
index 96c236d0..e05b04a2 100644
--- a/hscontrol/protocol_common_utils.go
+++ b/hscontrol/protocol_common_utils.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/binary"
diff --git a/hscontrol/protocol_legacy.go b/hscontrol/protocol_legacy.go
index 99f68e5e..67128286 100644
--- a/hscontrol/protocol_legacy.go
+++ b/hscontrol/protocol_legacy.go
@@ -1,6 +1,6 @@
 //go:build ts2019
 
-package headscale
+package hscontrol
 
 import (
 	"io"
diff --git a/hscontrol/protocol_legacy_poll.go b/hscontrol/protocol_legacy_poll.go
index a8d9343a..0121bf3f 100644
--- a/hscontrol/protocol_legacy_poll.go
+++ b/hscontrol/protocol_legacy_poll.go
@@ -1,6 +1,6 @@
 //go:build ts2019
 
-package headscale
+package hscontrol
 
 import (
 	"errors"
diff --git a/hscontrol/protocol_noise.go b/hscontrol/protocol_noise.go
index eb18a474..dfbad73b 100644
--- a/hscontrol/protocol_noise.go
+++ b/hscontrol/protocol_noise.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/protocol_noise_poll.go b/hscontrol/protocol_noise_poll.go
index d5e9a8a9..38f2b1c7 100644
--- a/hscontrol/protocol_noise_poll.go
+++ b/hscontrol/protocol_noise_poll.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"encoding/json"
diff --git a/hscontrol/routes.go b/hscontrol/routes.go
index f1fbb995..89f9a694 100644
--- a/hscontrol/routes.go
+++ b/hscontrol/routes.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"errors"
diff --git a/hscontrol/routes_test.go b/hscontrol/routes_test.go
index e2d056b7..1e5e2bbf 100644
--- a/hscontrol/routes_test.go
+++ b/hscontrol/routes_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"net/netip"
diff --git a/hscontrol/swagger.go b/hscontrol/swagger.go
index 306fc1f6..9072dcf0 100644
--- a/hscontrol/swagger.go
+++ b/hscontrol/swagger.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"bytes"
diff --git a/hscontrol/users.go b/hscontrol/users.go
index c32213aa..8782a890 100644
--- a/hscontrol/users.go
+++ b/hscontrol/users.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"errors"
diff --git a/hscontrol/users_test.go b/hscontrol/users_test.go
index 144c3337..12aa9880 100644
--- a/hscontrol/users_test.go
+++ b/hscontrol/users_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"net/netip"
diff --git a/hscontrol/utils.go b/hscontrol/utils.go
index 8bdb2b3f..9cfbf0ca 100644
--- a/hscontrol/utils.go
+++ b/hscontrol/utils.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package headscale
+package hscontrol
 
 import (
 	"context"
diff --git a/hscontrol/utils_test.go b/hscontrol/utils_test.go
index fd1d25e7..436df8ac 100644
--- a/hscontrol/utils_test.go
+++ b/hscontrol/utils_test.go
@@ -1,4 +1,4 @@
-package headscale
+package hscontrol
 
 import (
 	"net/netip"