diff --git a/Examples/100Clients/SimpleWsServer.php b/Examples/100Clients/SimpleWsRouter.php
similarity index 100%
rename from Examples/100Clients/SimpleWsServer.php
rename to Examples/100Clients/SimpleWsRouter.php
diff --git a/Examples/Authentication/Facebook/StartServerWithFacebookAuth.php b/Examples/Authentication/Facebook/StartRouterWithFacebookAuth.php
similarity index 100%
rename from Examples/Authentication/Facebook/StartServerWithFacebookAuth.php
rename to Examples/Authentication/Facebook/StartRouterWithFacebookAuth.php
diff --git a/Examples/Authentication/Github/StartServer.php b/Examples/Authentication/Github/StartRouter.php
similarity index 100%
rename from Examples/Authentication/Github/StartServer.php
rename to Examples/Authentication/Github/StartRouter.php
diff --git a/Examples/Authentication/GithubCallbackServer/StartServer.php b/Examples/Authentication/GithubCallbackServer/StartRouter.php
similarity index 100%
rename from Examples/Authentication/GithubCallbackServer/StartServer.php
rename to Examples/Authentication/GithubCallbackServer/StartRouter.php
diff --git a/Examples/Authentication/StartServer.php b/Examples/Authentication/StartRouter.php
similarity index 100%
rename from Examples/Authentication/StartServer.php
rename to Examples/Authentication/StartRouter.php
diff --git a/Examples/Authentication/WampCra/StartServerWithWampCra.php b/Examples/Authentication/WampCra/StartRouterWithWampCra.php
similarity index 100%
rename from Examples/Authentication/WampCra/StartServerWithWampCra.php
rename to Examples/Authentication/WampCra/StartRouterWithWampCra.php
diff --git a/Examples/FullBufferTest/SimpleWsServer.php b/Examples/FullBufferTest/SimpleWsRouter.php
similarity index 100%
rename from Examples/FullBufferTest/SimpleWsServer.php
rename to Examples/FullBufferTest/SimpleWsRouter.php
diff --git a/Examples/InternalClient/ServerWtihInternalClient.php b/Examples/InternalClient/RouterWtihInternalClient.php
similarity index 100%
rename from Examples/InternalClient/ServerWtihInternalClient.php
rename to Examples/InternalClient/RouterWtihInternalClient.php
diff --git a/Examples/Manager/WsServerWithManager.php b/Examples/Manager/WsRouterWithManager.php
similarity index 100%
rename from Examples/Manager/WsServerWithManager.php
rename to Examples/Manager/WsRouterWithManager.php
diff --git a/Examples/MetaEvent/ServerWtihInternalClient.php b/Examples/MetaEvent/RouterWtihInternalClient.php
similarity index 100%
rename from Examples/MetaEvent/ServerWtihInternalClient.php
rename to Examples/MetaEvent/RouterWtihInternalClient.php
diff --git a/Examples/SimpleWsServer.php b/Examples/SimpleWsRouter.php
similarity index 100%
rename from Examples/SimpleWsServer.php
rename to Examples/SimpleWsRouter.php
diff --git a/README.md b/README.md
index 761b981d..306f1881 100644
--- a/README.md
+++ b/README.md
@@ -65,9 +65,9 @@ Download Thruway and dependencies
 
       $ php composer.phar require "voryx/thruway":"0.3.*"
 
-Start the WAMP server
+Start the WAMP router
 
-      $ php vendor/voryx/thruway/Examples/SimpleWsServer.php
+      $ php vendor/voryx/thruway/Examples/SimpleWsRouter.php
     
 Thruway is now running on 127.0.0.1 port 9090 
 
@@ -140,7 +140,7 @@ You can also use [AutobahnJS](https://github.com/tavendo/AutobahnJS) or any othe
 
 Here are some [examples] (https://github.com/tavendo/AutobahnJS#show-me-some-code)
 
-Here's a [plunker](http://plnkr.co/edit/8vcBDUzIhp48JtuTGIaj?p=info) that will allow you to run some tests against a local server 
+Here's a [plunker](http://plnkr.co/edit/8vcBDUzIhp48JtuTGIaj?p=info) that will allow you to run some tests against a local router
 
 For AngularJS on the frontend, use the [Angular WAMP](https://github.com/voryx/angular-wamp) wrapper.