diff --git a/index.js b/index.js
index c1bd9e5..f0b93c1 100644
--- a/index.js
+++ b/index.js
@@ -197,7 +197,7 @@ var writers = {
   'byte': ByteWriter,
   'ubyte': UByteWriter,
   'string': StringWriter,
-  'byteArray': ByteArrayWriter,
+  'byteArray16': ByteArray16Writer,
   'bool': BoolWriter,
   'double': DoubleWriter,
   'float': FloatWriter,
@@ -207,8 +207,8 @@ var writers = {
 var readers = {
   'string': readString,
   'ascii': readAscii,
-  'byteArray': readByteArray,
-  'bigByteArray': readBigByteArray,
+  'byteArray16': readByteArray16,
+  'byteArray32': readByteArray32,
   'short': readShort,
   'ushort': readUShort,
   'int': readInt,
@@ -439,7 +439,7 @@ function readString (buffer, offset) {
   };
 }
 
-function readByteArray (buffer, offset) {
+function readByteArray16 (buffer, offset) {
   var results = readShort(buffer, offset);
   if (! results) return null;
 
@@ -455,7 +455,7 @@ function readByteArray (buffer, offset) {
   };
 }
 
-function readBigByteArray(buffer, offset) {
+function readByteArray32(buffer, offset) {
   var results = readInt(buffer, offset);
   if (! results) return null;
 
@@ -632,13 +632,13 @@ StringWriter.prototype.write = function(buffer, offset) {
   this.encoded.copy(buffer, offset + 2);
 };
 
-function ByteArrayWriter(value) {
-  assert.ok(Buffer.isBuffer(value), "non buffer passed to ByteArrayWriter");
+function ByteArray16Writer(value) {
+  assert.ok(Buffer.isBuffer(value), "non buffer passed to ByteArray16Writer");
   this.value = value;
   this.size = 2 + value.length;
 }
 
-ByteArrayWriter.prototype.write = function(buffer, offset) {
+ByteArray16Writer.prototype.write = function(buffer, offset) {
   buffer.writeInt16BE(this.value.length, offset);
   this.value.copy(buffer, offset + 2);
 };
diff --git a/packets.js b/packets.js
index 1804eb9..e6ebc29 100644
--- a/packets.js
+++ b/packets.js
@@ -726,7 +726,7 @@ module.exports = {
     },
     {
       name: "compressedData",
-      type: "bigByteArray"
+      type: "byteArray32"
     }
   ],
   0x34: [
@@ -744,7 +744,7 @@ module.exports = {
     },
     {
       name: "data",
-      type: "bigByteArray"
+      type: "byteArray32"
     }
   ],
   0x35: [
@@ -1126,7 +1126,7 @@ module.exports = {
     },
     {
       name: "nbtData",
-      type: "byteArray"
+      type: "byteArray16"
     }
   ],
   0xc8: [
@@ -1208,17 +1208,17 @@ module.exports = {
     },
     {
       name: "data",
-      type: "byteArray"
+      type: "byteArray16"
     }
   ],
   0xfc: [
     {
       name: "sharedSecret",
-      type: "byteArray"
+      type: "byteArray16"
     },
     {
       name: "verifyToken",
-      type: "byteArray"
+      type: "byteArray16"
     }
   ],
   0xfd: [
@@ -1228,11 +1228,11 @@ module.exports = {
     },
     {
       name: "publicKey",
-      type: "byteArray"
+      type: "byteArray16"
     },
     {
       name: "verifyToken",
-      type: "byteArray"
+      type: "byteArray16"
     }
   ],
   0xfe: [