diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index 8a1db76..a55f2a7 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -3,46 +3,61 @@ name: Acceptance
 on: [push, pull_request]
 
 jobs:
-  test-7-3:
+  test-7-4:
     runs-on: ubuntu-latest
-    name: Test PHP 7.3
+    name: Test PHP 7.4
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up PHP 7.3
+      uses: actions/checkout@v3
+    - name: Set up PHP 7.4
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.3'
+        php-version: '7.4'
     - name: Composer
       run: make install
     - name: Test
       run: make test
 
-  test-7-4:
+  test-8-0:
     runs-on: ubuntu-latest
-    name: Test PHP 7.4
+    name: Test PHP 8.0
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up PHP 7.4
+      uses: actions/checkout@v3
+    - name: Set up PHP 8.0
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
     - name: Composer
       run: make install
     - name: Test
       run: make test
 
-  test-8-0:
+  test-8-1:
     runs-on: ubuntu-latest
-    name: Test PHP 8.0
+    name: Test PHP 8.1
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up PHP 8.0
+      uses: actions/checkout@v3
+    - name: Set up PHP 8.1
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.1'
+    - name: Composer
+      run: make install
+    - name: Test
+      run: make test
+
+  test-8-2:
+    runs-on: ubuntu-latest
+    name: Test PHP 8.2
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up PHP 8.2
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.2'
     - name: Composer
       run: make install
     - name: Test
@@ -53,7 +68,7 @@ jobs:
     name: Code standard
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Set up PHP 8.0
       uses: shivammathur/setup-php@v2
       with:
@@ -68,7 +83,7 @@ jobs:
     name: Code coverage
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Set up PHP 8.0
       uses: shivammathur/setup-php@v2
       with:
diff --git a/Makefile b/Makefile
index 930a9ed..54d507e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ test: composer.lock
 	./vendor/bin/phpunit
 
 cs-check: composer.lock
-	./vendor/bin/phpcs --standard=codestandard.xml lib tests examples
+	./vendor/bin/phpcs --standard=PSR1,PSR12 --encoding=UTF-8 --report=full --colors lib tests examples
 
 coverage: composer.lock build
 	XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
diff --git a/codestandard.xml b/codestandard.xml
deleted file mode 100644
index bb1cd26..0000000
--- a/codestandard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<ruleset name="PSR with exception">
-    <arg name="encoding" value="UTF-8"/>
-    <arg name="report" value="full"/>
-    <arg name="colors"/>
-
-    <rule ref="PSR1"/>
-    <rule ref="PSR12"/>
-</ruleset>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 9bc0dcc..5e5c47d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,8 +8,7 @@
             "name": "Fredrik Liljegren"
         },
         {
-            "name": "Sören Jensen",
-            "email": "soren@abicart.se"
+            "name": "Sören Jensen"
         }
     ],
     "autoload": {
@@ -23,11 +22,13 @@
         }
     },
     "require": {
-        "php": "^7.2 | ^8.0",
-        "psr/log": "^1 | ^2 | ^3"
+        "php": "^7.4 | ^8.0",
+        "phrity/net-uri": "^1.0",
+        "psr/log": "^1.0 | ^2.0 | ^3.0",
+        "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.0",
+        "phpunit/phpunit": "^9.0",
         "php-coveralls/php-coveralls": "^2.0",
         "squizlabs/php_codesniffer": "^3.5"
     }
diff --git a/lib/BadOpcodeException.php b/lib/BadOpcodeException.php
index a518715..260a977 100644
--- a/lib/BadOpcodeException.php
+++ b/lib/BadOpcodeException.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket;
 
 class BadOpcodeException extends Exception
diff --git a/lib/BadUriException.php b/lib/BadUriException.php
index 39e975d..a1f5ead 100644
--- a/lib/BadUriException.php
+++ b/lib/BadUriException.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket;
 
 class BadUriException extends Exception
diff --git a/lib/Client.php b/lib/Client.php
index 61c51f3..b9c73b2 100644
--- a/lib/Client.php
+++ b/lib/Client.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2014-2021 Textalk/Abicart and contributors.
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
  *
  * This file is part of Websocket PHP and is free software under the ISC License.
  * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
diff --git a/lib/Connection.php b/lib/Connection.php
index af6f560..f51b0ff 100644
--- a/lib/Connection.php
+++ b/lib/Connection.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2014-2021 Textalk/Abicart and contributors.
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
  *
  * This file is part of Websocket PHP and is free software under the ISC License.
  * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
@@ -9,8 +9,15 @@
 
 namespace WebSocket;
 
-use Psr\Log\{LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger};
-use WebSocket\Message\{Factory, Message};
+use Psr\Log\{
+    LoggerAwareInterface,
+    LoggerAwareTrait,
+    LoggerInterface, NullLogger
+};
+use WebSocket\Message\{
+    Factory,
+    Message
+};
 
 class Connection implements LoggerAwareInterface
 {
@@ -404,7 +411,7 @@ public function getName(): ?string
      * Get name of remote socket, or null if not connected.
      * @return string|null
      */
-    public function getPeer(): ?string
+    public function getRemoteName(): ?string
     {
         return stream_socket_get_name($this->stream, true);
     }
diff --git a/lib/ConnectionException.php b/lib/ConnectionException.php
index 7e1ecbf..aa1d7f4 100644
--- a/lib/ConnectionException.php
+++ b/lib/ConnectionException.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket;
 
 use Throwable;
diff --git a/lib/Message/Binary.php b/lib/Message/Binary.php
index 84d27f5..b0edb8d 100644
--- a/lib/Message/Binary.php
+++ b/lib/Message/Binary.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 class Binary extends Message
diff --git a/lib/Message/Close.php b/lib/Message/Close.php
index b759fe9..c69f38f 100644
--- a/lib/Message/Close.php
+++ b/lib/Message/Close.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 class Close extends Message
diff --git a/lib/Message/Factory.php b/lib/Message/Factory.php
index 31df89c..9f34785 100644
--- a/lib/Message/Factory.php
+++ b/lib/Message/Factory.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 use WebSocket\BadOpcodeException;
diff --git a/lib/Message/Message.php b/lib/Message/Message.php
index 3815871..1bf5a8d 100644
--- a/lib/Message/Message.php
+++ b/lib/Message/Message.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 use DateTime;
diff --git a/lib/Message/Ping.php b/lib/Message/Ping.php
index 908d233..f9bb652 100644
--- a/lib/Message/Ping.php
+++ b/lib/Message/Ping.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 class Ping extends Message
diff --git a/lib/Message/Pong.php b/lib/Message/Pong.php
index 76a8f9e..b8d5479 100644
--- a/lib/Message/Pong.php
+++ b/lib/Message/Pong.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 class Pong extends Message
diff --git a/lib/Message/Text.php b/lib/Message/Text.php
index 88a22f7..1acb365 100644
--- a/lib/Message/Text.php
+++ b/lib/Message/Text.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket\Message;
 
 class Text extends Message
diff --git a/lib/OpcodeTrait.php b/lib/OpcodeTrait.php
index 4453660..c3e2b18 100644
--- a/lib/OpcodeTrait.php
+++ b/lib/OpcodeTrait.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2014-2021 Textalk/Abicart and contributors.
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
  *
  * This file is part of Websocket PHP and is free software under the ISC License.
  * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
diff --git a/lib/Server.php b/lib/Server.php
index 3d81733..b136217 100644
--- a/lib/Server.php
+++ b/lib/Server.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2014-2021 Textalk/Abicart and contributors.
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
  *
  * This file is part of Websocket PHP and is free software under the ISC License.
  * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
diff --git a/lib/TimeoutException.php b/lib/TimeoutException.php
index d20e622..7276556 100644
--- a/lib/TimeoutException.php
+++ b/lib/TimeoutException.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Copyright (C) 2014-2022 Textalk/Abicart and contributors.
+ *
+ * This file is part of Websocket PHP and is free software under the ISC License.
+ * License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
+ */
+
 namespace WebSocket;
 
 class TimeoutException extends ConnectionException
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 893ab65..60aa5bb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Unit tests">
-            <directory suffix=".php">tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">lib/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">lib/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit tests">
+      <directory suffix=".php">tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>