diff --git a/src/WebSocketConnection.php b/src/WebSocketConnection.php
index aa8ac17..bce482d 100644
--- a/src/WebSocketConnection.php
+++ b/src/WebSocketConnection.php
@@ -28,8 +28,8 @@ class WebSocketConnection implements WebSocketInterface
     /** @var string|null The name of the group that this connection has joined, or null */
     private ?string $groupName = null;
 
-    /** @var WebSocketCodec The frame encoder/decoder */
-    private WebSocketCodec $codec;
+    /** @var WebSocketProtocol The frame encoder/decoder */
+    private WebSocketProtocol $codec;
 
     private ?ConnectionGroup $group = null;
 
@@ -41,14 +41,16 @@ class WebSocketConnection implements WebSocketInterface
 
     private ServerRequestInterface $request;
 
+    /** @var string|null Buffer for fragmented messages */
     private ?string $buffer = null;
 
+    /** @var int|null The opcode of a fragmented message */
     private ?int $bufferedOp = null;
 
     public function __construct(ServerRequestInterface $request, ReadableStreamInterface $inStream, WritableStreamInterface $outStream, GroupManager $groupManager)
     {
         // The codec is used to encode and decode frames
-        $this->codec = new WebSocketCodec();
+        $this->codec = new WebSocketProtocol();
         
         $this->request = $request;
         $this->inStream = $inStream;
diff --git a/src/WebSocketCodec.php b/src/WebSocketProtocol.php
similarity index 99%
rename from src/WebSocketCodec.php
rename to src/WebSocketProtocol.php
index fab998a..1c8de35 100644
--- a/src/WebSocketCodec.php
+++ b/src/WebSocketProtocol.php
@@ -14,7 +14,7 @@ use React\Stream\ReadableStreamInterface;
 use React\Stream\ThroughStream;
 use React\Stream\WritableStreamInterface;
 
-class WebSocketCodec
+class WebSocketProtocol
 {
 
     /**
diff --git a/tests/WebSocketCodecTest.php b/tests/WebSocketProtocolTest.php
similarity index 93%
rename from tests/WebSocketCodecTest.php
rename to tests/WebSocketProtocolTest.php
index 1c7db00..7d2c734 100644
--- a/tests/WebSocketCodecTest.php
+++ b/tests/WebSocketProtocolTest.php
@@ -4,13 +4,13 @@ namespace NoccyLabs\React\WebSocket;
 
 use PHPUnit\Framework\Attributes\CoversClass;
 
-#[CoversClass(WebSocketCodec::class)]
-class WebSocketCodecTest extends \PHPUnit\Framework\TestCase
+#[CoversClass(WebSocketProtocol::class)]
+class WebSocketProtocolTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testEncodingFrames()
     {
-        $codec = new WebSocketCodec();
+        $codec = new WebSocketProtocol();
 
         $msg = $codec->encode([
             'opcode'=>WebSocketConnection::OP_PING,
@@ -43,7 +43,7 @@ class WebSocketCodecTest extends \PHPUnit\Framework\TestCase
 
     public function testDecodingFrames()
     {
-        $codec = new WebSocketCodec();
+        $codec = new WebSocketProtocol();
 
         $msg = $codec->decode("\x89\x04ping");
         $this->assertEquals([