diff --git a/cmd/headscale/cli/namespaces.go b/cmd/headscale/cli/users.go
similarity index 98%
rename from cmd/headscale/cli/namespaces.go
rename to cmd/headscale/cli/users.go
index 59f59763..c3ec90b4 100644
--- a/cmd/headscale/cli/namespaces.go
+++ b/cmd/headscale/cli/users.go
@@ -27,7 +27,7 @@ const (
 var userCmd = &cobra.Command{
 	Use:     "users",
 	Short:   "Manage the users of Headscale",
-	Aliases: []string{"user", "ns", "user", "users"},
+	Aliases: []string{"user", "namespace", "ns"},
 }
 
 var createUserCmd = &cobra.Command{
diff --git a/namespaces.go b/users.go
similarity index 100%
rename from namespaces.go
rename to users.go
diff --git a/namespaces_test.go b/users_test.go
similarity index 100%
rename from namespaces_test.go
rename to users_test.go