diff --git a/src/Handshake/Negotiator.php b/src/Handshake/ServerNegotiator.php
similarity index 98%
rename from src/Handshake/Negotiator.php
rename to src/Handshake/ServerNegotiator.php
index 948993c..e1709e3 100644
--- a/src/Handshake/Negotiator.php
+++ b/src/Handshake/ServerNegotiator.php
@@ -7,7 +7,7 @@ use GuzzleHttp\Psr7\Response;
  * The latest version of the WebSocket protocol
  * @todo Unicode: return mb_convert_encoding(pack("N",$u), mb_internal_encoding(), 'UCS-4BE');
  */
-class Negotiator implements NegotiatorInterface {
+class ServerNegotiator implements NegotiatorInterface {
     /**
      * @var \Ratchet\RFC6455\Handshake\RequestVerifier
      */
diff --git a/tests/ab/startServer.php b/tests/ab/startServer.php
index 846b0be..ef42de3 100644
--- a/tests/ab/startServer.php
+++ b/tests/ab/startServer.php
@@ -11,7 +11,7 @@ $socket = new \React\Socket\Server($loop);
 $server = new \React\Http\Server($socket);
 
 $closeFrameChecker = new \Ratchet\RFC6455\Messaging\CloseFrameChecker;
-$negotiator = new \Ratchet\RFC6455\Handshake\Negotiator;
+$negotiator = new \Ratchet\RFC6455\Handshake\ServerNegotiator;
 
 $uException = new \UnderflowException;