diff --git a/atproto/data/basic_test.go b/atproto/atdata/basic_test.go
similarity index 99%
rename from atproto/data/basic_test.go
rename to atproto/atdata/basic_test.go
index 5d5356c6..bae3d88f 100644
--- a/atproto/data/basic_test.go
+++ b/atproto/atdata/basic_test.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding/json"
diff --git a/atproto/data/blob.go b/atproto/atdata/blob.go
similarity index 99%
rename from atproto/data/blob.go
rename to atproto/atdata/blob.go
index db3d12f1..3537e27c 100644
--- a/atproto/data/blob.go
+++ b/atproto/atdata/blob.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"bytes"
diff --git a/atproto/data/bytes.go b/atproto/atdata/bytes.go
similarity index 98%
rename from atproto/data/bytes.go
rename to atproto/atdata/bytes.go
index b849db5f..dcee4aed 100644
--- a/atproto/data/bytes.go
+++ b/atproto/atdata/bytes.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding/base64"
diff --git a/atproto/data/cbor_gen.go b/atproto/atdata/cbor_gen.go
similarity index 99%
rename from atproto/data/cbor_gen.go
rename to atproto/atdata/cbor_gen.go
index 18280b70..23a2d1f8 100644
--- a/atproto/data/cbor_gen.go
+++ b/atproto/atdata/cbor_gen.go
@@ -1,6 +1,6 @@
 // Code generated by github.com/whyrusleeping/cbor-gen. DO NOT EDIT.
 
-package data
+package atdata
 
 import (
 	"fmt"
diff --git a/atproto/data/cidlink.go b/atproto/atdata/cidlink.go
similarity index 99%
rename from atproto/data/cidlink.go
rename to atproto/atdata/cidlink.go
index c349ec04..3f129622 100644
--- a/atproto/data/cidlink.go
+++ b/atproto/atdata/cidlink.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding/json"
diff --git a/atproto/data/const.go b/atproto/atdata/const.go
similarity index 99%
rename from atproto/data/const.go
rename to atproto/atdata/const.go
index a3c28ef0..becd7c98 100644
--- a/atproto/data/const.go
+++ b/atproto/atdata/const.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 const (
 	// maximum size of any CBOR data, in any context, in atproto
diff --git a/atproto/data/data.go b/atproto/atdata/data.go
similarity index 99%
rename from atproto/data/data.go
rename to atproto/atdata/data.go
index 560566c2..1d824c4b 100644
--- a/atproto/data/data.go
+++ b/atproto/atdata/data.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding/json"
diff --git a/atproto/data/doc.go b/atproto/atdata/doc.go
similarity index 90%
rename from atproto/data/doc.go
rename to atproto/atdata/doc.go
index dd463564..1f78431e 100644
--- a/atproto/data/doc.go
+++ b/atproto/atdata/doc.go
@@ -1,5 +1,5 @@
 /*
-Package data supports schema-less serializaiton and deserialization of atproto data
+Package atdata supports schema-less serializaiton and deserialization of atproto data
 
 Some restrictions from the data model include:
 - string sizes
@@ -15,4 +15,4 @@ Can parse generic atproto records (or other objects) in JSON or CBOR format in t
 
 Has a helper for serializing generic data (map[string]interface{}) to CBOR, which handles converting JSON-style object types (like $link and $bytes) as needed. There is no "MarshalJSON" method; simply use the standard library's `encoding/json`.
 */
-package data
+package atdata
diff --git a/atproto/data/extract.go b/atproto/atdata/extract.go
similarity index 98%
rename from atproto/data/extract.go
rename to atproto/atdata/extract.go
index 81fc6550..b2442a32 100644
--- a/atproto/data/extract.go
+++ b/atproto/atdata/extract.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"bytes"
diff --git a/atproto/data/extract_test.go b/atproto/atdata/extract_test.go
similarity index 97%
rename from atproto/data/extract_test.go
rename to atproto/atdata/extract_test.go
index 3a80892c..e56f15fa 100644
--- a/atproto/data/extract_test.go
+++ b/atproto/atdata/extract_test.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"io"
diff --git a/atproto/data/interop_test.go b/atproto/atdata/interop_test.go
similarity index 99%
rename from atproto/data/interop_test.go
rename to atproto/atdata/interop_test.go
index a73da1fb..3955014b 100644
--- a/atproto/data/interop_test.go
+++ b/atproto/atdata/interop_test.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding/base64"
diff --git a/atproto/data/parse.go b/atproto/atdata/parse.go
similarity index 99%
rename from atproto/data/parse.go
rename to atproto/atdata/parse.go
index e8e7412d..23fbd50e 100644
--- a/atproto/data/parse.go
+++ b/atproto/atdata/parse.go
@@ -1,4 +1,4 @@
-package data
+package atdata
 
 import (
 	"encoding"
diff --git a/atproto/data/testdata/data-model-fixtures.json b/atproto/atdata/testdata/data-model-fixtures.json
similarity index 100%
rename from atproto/data/testdata/data-model-fixtures.json
rename to atproto/atdata/testdata/data-model-fixtures.json
diff --git a/atproto/data/testdata/data-model-invalid.json b/atproto/atdata/testdata/data-model-invalid.json
similarity index 100%
rename from atproto/data/testdata/data-model-invalid.json
rename to atproto/atdata/testdata/data-model-invalid.json
diff --git a/atproto/data/testdata/data-model-valid.json b/atproto/atdata/testdata/data-model-valid.json
similarity index 100%
rename from atproto/data/testdata/data-model-valid.json
rename to atproto/atdata/testdata/data-model-valid.json
diff --git a/atproto/data/testdata/feedpost_record.cbor b/atproto/atdata/testdata/feedpost_record.cbor
similarity index 100%
rename from atproto/data/testdata/feedpost_record.cbor
rename to atproto/atdata/testdata/feedpost_record.cbor