diff --git a/src/Server.php b/src/Server.php
index 8bc2da674..33197af82 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -51,7 +51,7 @@ use pocketmine\network\mcpe\compression\CompressBatchPromise;
 use pocketmine\network\mcpe\compression\CompressBatchTask;
 use pocketmine\network\mcpe\compression\Compressor;
 use pocketmine\network\mcpe\compression\ZlibCompressor;
-use pocketmine\network\mcpe\encryption\NetworkCipher;
+use pocketmine\network\mcpe\encryption\EncryptionContext;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
@@ -880,7 +880,7 @@ class Server{
 
 			$this->networkCompressionAsync = (bool) $this->configGroup->getProperty("network.async-compression", true);
 
-			NetworkCipher::$ENABLED = (bool) $this->configGroup->getProperty("network.enable-encryption", true);
+			EncryptionContext::$ENABLED = (bool) $this->configGroup->getProperty("network.enable-encryption", true);
 
 			$this->doTitleTick = ((bool) $this->configGroup->getProperty("console.title-tick", true)) && Terminal::hasFormattingCodes();
 
diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index c5c249c94..43f555bda 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -42,7 +42,7 @@ use pocketmine\network\mcpe\compression\DecompressionException;
 use pocketmine\network\mcpe\convert\SkinAdapterSingleton;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\encryption\DecryptionException;
-use pocketmine\network\mcpe\encryption\NetworkCipher;
+use pocketmine\network\mcpe\encryption\EncryptionContext;
 use pocketmine\network\mcpe\encryption\PrepareEncryptionTask;
 use pocketmine\network\mcpe\handler\DeathPacketHandler;
 use pocketmine\network\mcpe\handler\HandshakePacketHandler;
@@ -148,7 +148,7 @@ class NetworkSession{
 	/** @var int */
 	private $connectTime;
 
-	/** @var NetworkCipher */
+	/** @var EncryptionContext */
 	private $cipher;
 
 	/** @var PacketBatch|null */
@@ -588,14 +588,14 @@ class NetworkSession{
 		$this->logger->debug("Xbox Live authenticated: " . ($this->authenticated ? "YES" : "NO"));
 
 		if($this->manager->kickDuplicates($this)){
-			if(NetworkCipher::$ENABLED){
+			if(EncryptionContext::$ENABLED){
 				$this->server->getAsyncPool()->submitTask(new PrepareEncryptionTask($clientPubKey, function(string $encryptionKey, string $handshakeJwt) : void{
 					if(!$this->connected){
 						return;
 					}
 					$this->sendDataPacket(ServerToClientHandshakePacket::create($handshakeJwt), true); //make sure this gets sent before encryption is enabled
 
-					$this->cipher = new NetworkCipher($encryptionKey);
+					$this->cipher = new EncryptionContext($encryptionKey);
 
 					$this->setHandler(new HandshakePacketHandler(function() : void{
 						$this->onLoginSuccess();
diff --git a/src/network/mcpe/encryption/NetworkCipher.php b/src/network/mcpe/encryption/EncryptionContext.php
similarity index 99%
rename from src/network/mcpe/encryption/NetworkCipher.php
rename to src/network/mcpe/encryption/EncryptionContext.php
index 8a71b7647..b6cd47107 100644
--- a/src/network/mcpe/encryption/NetworkCipher.php
+++ b/src/network/mcpe/encryption/EncryptionContext.php
@@ -30,7 +30,7 @@ use function openssl_digest;
 use function strlen;
 use function substr;
 
-class NetworkCipher{
+class EncryptionContext{
 	private const ENCRYPTION_SCHEME = "AES-256-CFB8";
 	private const CHECKSUM_ALGO = "sha256";