diff --git a/atproto/client/admin_auth.go b/atproto/atclient/admin_auth.go
similarity index 96%
rename from atproto/client/admin_auth.go
rename to atproto/atclient/admin_auth.go
index bab09e87..b80ed078 100644
--- a/atproto/client/admin_auth.go
+++ b/atproto/atclient/admin_auth.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"net/http"
diff --git a/atproto/client/admin_auth_test.go b/atproto/atclient/admin_auth_test.go
similarity index 98%
rename from atproto/client/admin_auth_test.go
rename to atproto/atclient/admin_auth_test.go
index 1434778c..19bb043e 100644
--- a/atproto/client/admin_auth_test.go
+++ b/atproto/atclient/admin_auth_test.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"context"
diff --git a/atproto/client/apiclient.go b/atproto/atclient/apiclient.go
similarity index 99%
rename from atproto/client/apiclient.go
rename to atproto/atclient/apiclient.go
index 3811f7ca..0a0fe732 100644
--- a/atproto/client/apiclient.go
+++ b/atproto/atclient/apiclient.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"bytes"
diff --git a/atproto/client/apiclient_test.go b/atproto/atclient/apiclient_test.go
similarity index 97%
rename from atproto/client/apiclient_test.go
rename to atproto/atclient/apiclient_test.go
index 55c568cc..b227f5dc 100644
--- a/atproto/client/apiclient_test.go
+++ b/atproto/atclient/apiclient_test.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"testing"
diff --git a/atproto/client/apierror.go b/atproto/atclient/apierror.go
similarity index 97%
rename from atproto/client/apierror.go
rename to atproto/atclient/apierror.go
index a319362c..f0003960 100644
--- a/atproto/client/apierror.go
+++ b/atproto/atclient/apierror.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"fmt"
diff --git a/atproto/client/apirequest.go b/atproto/atclient/apirequest.go
similarity index 99%
rename from atproto/client/apirequest.go
rename to atproto/atclient/apirequest.go
index 36e7258a..b676ad83 100644
--- a/atproto/client/apirequest.go
+++ b/atproto/atclient/apirequest.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"context"
diff --git a/atproto/client/cmd/atp-client-demo/main.go b/atproto/atclient/cmd/atp-client-demo/main.go
similarity index 90%
rename from atproto/client/cmd/atp-client-demo/main.go
rename to atproto/atclient/cmd/atp-client-demo/main.go
index 11a12b2e..e2223e3c 100644
--- a/atproto/client/cmd/atp-client-demo/main.go
+++ b/atproto/atclient/cmd/atp-client-demo/main.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	comatproto "github.com/bluesky-social/indigo/api/agnostic"
-	"github.com/bluesky-social/indigo/atproto/client"
+	"github.com/bluesky-social/indigo/atproto/atclient"
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/bluesky-social/indigo/atproto/syntax"
 
@@ -120,7 +120,7 @@ func main() {
 	app.RunAndExitOnError()
 }
 
-func getFeed(ctx context.Context, c *client.APIClient) error {
+func getFeed(ctx context.Context, c *atclient.APIClient) error {
 	params := map[string]any{
 		"actor":       "atproto.com",
 		"limit":       2,
@@ -141,7 +141,7 @@ func getFeed(ctx context.Context, c *client.APIClient) error {
 	return nil
 }
 
-func listRecords(ctx context.Context, c *client.APIClient) error {
+func listRecords(ctx context.Context, c *atclient.APIClient) error {
 
 	list, err := comatproto.RepoListRecords(ctx, c, "app.bsky.actor.profile", "", 10, "did:plc:ewvi7nxzyoun6zhxrhs64oiz", false)
 	if err != nil {
@@ -159,7 +159,7 @@ func listRecords(ctx context.Context, c *client.APIClient) error {
 func runGetFeedPublic(cctx *cli.Context) error {
 	ctx := cctx.Context
 
-	c := client.APIClient{
+	c := atclient.APIClient{
 		Host: cctx.String("host"),
 	}
 
@@ -169,7 +169,7 @@ func runGetFeedPublic(cctx *cli.Context) error {
 func runListRecordsPublic(cctx *cli.Context) error {
 	ctx := cctx.Context
 
-	c := client.APIClient{
+	c := atclient.APIClient{
 		Host: cctx.String("host"),
 	}
 
@@ -186,7 +186,7 @@ func runLoginAuth(cctx *cli.Context) error {
 
 	dir := identity.DefaultDirectory()
 
-	c, err := client.LoginWithPassword(ctx, dir, *atid, cctx.String("password"), "", nil)
+	c, err := atclient.LoginWithPassword(ctx, dir, *atid, cctx.String("password"), "", nil)
 	if err != nil {
 		return err
 	}
@@ -215,7 +215,7 @@ func runGetFeedAuth(cctx *cli.Context) error {
 
 	dir := identity.DefaultDirectory()
 
-	c, err := client.LoginWithPassword(ctx, dir, *atid, cctx.String("password"), "", nil)
+	c, err := atclient.LoginWithPassword(ctx, dir, *atid, cctx.String("password"), "", nil)
 	if err != nil {
 		return err
 	}
@@ -227,7 +227,7 @@ func runGetFeedAuth(cctx *cli.Context) error {
 func runLookupAdmin(cctx *cli.Context) error {
 	ctx := cctx.Context
 
-	c := client.NewAdminClient(cctx.String("host"), cctx.String("admin-password"))
+	c := atclient.NewAdminClient(cctx.String("host"), cctx.String("admin-password"))
 
 	var d json.RawMessage
 	params := map[string]any{
diff --git a/atproto/client/doc.go b/atproto/atclient/doc.go
similarity index 99%
rename from atproto/client/doc.go
rename to atproto/atclient/doc.go
index 67ea70f9..47a5643b 100644
--- a/atproto/client/doc.go
+++ b/atproto/atclient/doc.go
@@ -18,4 +18,4 @@ In theory, the [http.RoundTripper] interface could have been used instead of [Au
 
 This package tries to use minimal dependencies beyond the Go standard library, to make it easy to reference as a dependency. It does require the [github.com/bluesky-social/indigo/atproto/syntax] and [github.com/bluesky-social/indigo/atproto/identity] sibling packages. In particular, this package does not include any auth methods requiring JWTs, to avoid adding any specific JWT implementation as a dependency.
 */
-package client
+package atclient
diff --git a/atproto/client/examples_test.go b/atproto/atclient/examples_test.go
similarity index 96%
rename from atproto/client/examples_test.go
rename to atproto/atclient/examples_test.go
index abf746d3..4d623dcf 100644
--- a/atproto/client/examples_test.go
+++ b/atproto/atclient/examples_test.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"context"
diff --git a/atproto/client/lexclient.go b/atproto/atclient/lexclient.go
similarity index 99%
rename from atproto/client/lexclient.go
rename to atproto/atclient/lexclient.go
index 91f5b05e..c72d814a 100644
--- a/atproto/client/lexclient.go
+++ b/atproto/atclient/lexclient.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"bytes"
diff --git a/atproto/client/params.go b/atproto/atclient/params.go
similarity index 98%
rename from atproto/client/params.go
rename to atproto/atclient/params.go
index 46324874..cefba522 100644
--- a/atproto/client/params.go
+++ b/atproto/atclient/params.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"encoding"
diff --git a/atproto/client/params_test.go b/atproto/atclient/params_test.go
similarity index 98%
rename from atproto/client/params_test.go
rename to atproto/atclient/params_test.go
index 55690a34..5db429b5 100644
--- a/atproto/client/params_test.go
+++ b/atproto/atclient/params_test.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"net/url"
diff --git a/atproto/client/password_auth.go b/atproto/atclient/password_auth.go
similarity index 99%
rename from atproto/client/password_auth.go
rename to atproto/atclient/password_auth.go
index 7e92196a..3f3af5d2 100644
--- a/atproto/client/password_auth.go
+++ b/atproto/atclient/password_auth.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"context"
diff --git a/atproto/client/password_auth_test.go b/atproto/atclient/password_auth_test.go
similarity index 99%
rename from atproto/client/password_auth_test.go
rename to atproto/atclient/password_auth_test.go
index a45f9bfb..6f801207 100644
--- a/atproto/client/password_auth_test.go
+++ b/atproto/atclient/password_auth_test.go
@@ -1,4 +1,4 @@
-package client
+package atclient
 
 import (
 	"bytes"
diff --git a/atproto/client/testdata/body.json b/atproto/atclient/testdata/body.json
similarity index 100%
rename from atproto/client/testdata/body.json
rename to atproto/atclient/testdata/body.json