diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index b08c8cddd..44405214f 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -342,7 +342,7 @@ class NetworkSession{
 			try{
 				$this->handleDataPacket($pk);
 			}catch(BadPacketException $e){
-				$this->logger->debug($pk->getName() . ": " . base64_encode($pk->getBinaryStream()->getBuffer()));
+				$this->logger->debug($pk->getName() . ": " . base64_encode($pk->getSerializer()->getBuffer()));
 				throw BadPacketException::wrap($e, "Error processing " . $pk->getName());
 			}
 		}
@@ -354,7 +354,7 @@ class NetworkSession{
 	public function handleDataPacket(Packet $packet) : void{
 		if(!($packet instanceof ServerboundPacket)){
 			if($packet instanceof GarbageServerboundPacket){
-				$this->logger->debug("Garbage serverbound " . $packet->getName() . ": " . base64_encode($packet->getBinaryStream()->getBuffer()));
+				$this->logger->debug("Garbage serverbound " . $packet->getName() . ": " . base64_encode($packet->getSerializer()->getBuffer()));
 				return;
 			}
 			throw new BadPacketException("Unexpected non-serverbound packet");
@@ -369,7 +369,7 @@ class NetworkSession{
 			}catch(PacketDecodeException $e){
 				throw BadPacketException::wrap($e);
 			}
-			$stream = $packet->getBinaryStream();
+			$stream = $packet->getSerializer();
 			if(!$stream->feof()){
 				$remains = substr($stream->getBuffer(), $stream->getOffset());
 				$this->logger->debug("Still " . strlen($remains) . " bytes unread in " . $packet->getName() . ": " . bin2hex($remains));
diff --git a/src/network/mcpe/protocol/DataPacket.php b/src/network/mcpe/protocol/DataPacket.php
index 89e8280e4..e61ad00f7 100644
--- a/src/network/mcpe/protocol/DataPacket.php
+++ b/src/network/mcpe/protocol/DataPacket.php
@@ -51,7 +51,7 @@ abstract class DataPacket implements Packet{
 		$this->buf = new PacketSerializer();
 	}
 
-	public function getBinaryStream() : PacketSerializer{
+	public function getSerializer() : PacketSerializer{
 		return $this->buf;
 	}
 
diff --git a/src/network/mcpe/protocol/Packet.php b/src/network/mcpe/protocol/Packet.php
index d2aff314d..b2f6317ee 100644
--- a/src/network/mcpe/protocol/Packet.php
+++ b/src/network/mcpe/protocol/Packet.php
@@ -27,7 +27,7 @@ use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
 
 interface Packet{
 
-	public function getBinaryStream() : PacketSerializer;
+	public function getSerializer() : PacketSerializer;
 
 	public function pid() : int;
 
diff --git a/src/network/mcpe/protocol/PacketPool.php b/src/network/mcpe/protocol/PacketPool.php
index 6c0fc2d0e..dd2b0879b 100644
--- a/src/network/mcpe/protocol/PacketPool.php
+++ b/src/network/mcpe/protocol/PacketPool.php
@@ -201,7 +201,7 @@ class PacketPool{
 	public function getPacket(string $buffer) : Packet{
 		$offset = 0;
 		$pk = $this->getPacketById(Binary::readUnsignedVarInt($buffer, $offset) & DataPacket::PID_MASK);
-		$pk->getBinaryStream()->setBuffer($buffer, $offset);
+		$pk->getSerializer()->setBuffer($buffer, $offset);
 
 		return $pk;
 	}
diff --git a/src/network/mcpe/protocol/serializer/PacketBatch.php b/src/network/mcpe/protocol/serializer/PacketBatch.php
index 605f6be65..a242a2b6f 100644
--- a/src/network/mcpe/protocol/serializer/PacketBatch.php
+++ b/src/network/mcpe/protocol/serializer/PacketBatch.php
@@ -30,22 +30,22 @@ use pocketmine\utils\BinaryDataException;
 class PacketBatch{
 
 	/** @var PacketSerializer */
-	private $binaryStream;
+	private $serializer;
 
 	public function __construct(?string $buffer = null){
-		$this->binaryStream = new PacketSerializer($buffer ?? "");
+		$this->serializer = new PacketSerializer($buffer ?? "");
 	}
 
 	public function putPacket(Packet $packet) : void{
 		$packet->encode();
-		$this->binaryStream->putString($packet->getBinaryStream()->getBuffer());
+		$this->serializer->putString($packet->getSerializer()->getBuffer());
 	}
 
 	/**
 	 * @throws BinaryDataException
 	 */
 	public function getPacket(PacketPool $packetPool) : Packet{
-		return $packetPool->getPacket($this->binaryStream->getString());
+		return $packetPool->getPacket($this->serializer->getString());
 	}
 
 	/**
@@ -64,10 +64,10 @@ class PacketBatch{
 	}
 
 	public function getBuffer() : string{
-		return $this->binaryStream->getBuffer();
+		return $this->serializer->getBuffer();
 	}
 
 	public function feof() : bool{
-		return $this->binaryStream->feof();
+		return $this->serializer->feof();
 	}
 }
diff --git a/tests/phpunit/network/mcpe/protocol/DataPacketTest.php b/tests/phpunit/network/mcpe/protocol/DataPacketTest.php
index 5163d36aa..bcfd0e9d2 100644
--- a/tests/phpunit/network/mcpe/protocol/DataPacketTest.php
+++ b/tests/phpunit/network/mcpe/protocol/DataPacketTest.php
@@ -34,7 +34,7 @@ class DataPacketTest extends TestCase{
 		$pk->encode();
 
 		$pk2 = new TestPacket();
-		$pk2->getBinaryStream()->setBuffer($pk->getBinaryStream()->getBuffer());
+		$pk2->getSerializer()->setBuffer($pk->getSerializer()->getBuffer());
 		$pk2->decode();
 		self::assertSame($pk2->senderSubId, 3);
 		self::assertSame($pk2->recipientSubId, 2);