diff --git a/src/LaravelEcho/WebSocket/EchoServer.php b/src/LaravelEcho/WebSocket/PusherServer.php
similarity index 97%
rename from src/LaravelEcho/WebSocket/EchoServer.php
rename to src/LaravelEcho/WebSocket/PusherServer.php
index 1d76ccf..e54bdbd 100644
--- a/src/LaravelEcho/WebSocket/EchoServer.php
+++ b/src/LaravelEcho/WebSocket/PusherServer.php
@@ -9,7 +9,7 @@ use Ratchet\RFC6455\Messaging\MessageInterface;
 use BeyondCode\LaravelWebSockets\WebSocketController;
 use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
 
-class EchoServer extends WebSocketController
+class PusherServer extends WebSocketController
 {
     /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
     protected $channelManager;
diff --git a/src/Router.php b/src/Router.php
index 55d6a61..5a7c046 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -66,7 +66,7 @@ class Router
     public function echo()
     {
         //TODO: add origin checker middleware
-        $this->get('/app/{appId}', LaravelEcho\WebSocket\EchoServer::class);
+        $this->get('/app/{appId}', LaravelEcho\WebSocket\PusherServer::class);
 
         // TODO: fleshen out http API
         $this->get('/apps/{appId}/status', LaravelEcho\Http\Controllers\StatusController::class);