diff --git a/src/Ratchet/Component/WAMP/Command/Action/CallError.php b/src/Ratchet/Component/WAMP/Command/Action/CallError.php
index 0afa7de..ad28763 100644
--- a/src/Ratchet/Component/WAMP/Command/Action/CallError.php
+++ b/src/Ratchet/Component/WAMP/Command/Action/CallError.php
@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Component\WAMP\Command\Action;
 use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\App as WAMP;
+use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
 
 class CallError extends SendMessage {
     protected $_id;
diff --git a/src/Ratchet/Component/WAMP/Command/Action/CallResult.php b/src/Ratchet/Component/WAMP/Command/Action/CallResult.php
index 1303e15..4df370d 100644
--- a/src/Ratchet/Component/WAMP/Command/Action/CallResult.php
+++ b/src/Ratchet/Component/WAMP/Command/Action/CallResult.php
@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Component\WAMP\Command\Action;
 use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\App as WAMP;
+use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
 
 /**
  */
diff --git a/src/Ratchet/Component/WAMP/Command/Action/Event.php b/src/Ratchet/Component/WAMP/Command/Action/Event.php
index 6a25372..b711b74 100644
--- a/src/Ratchet/Component/WAMP/Command/Action/Event.php
+++ b/src/Ratchet/Component/WAMP/Command/Action/Event.php
@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Component\WAMP\Command\Action;
 use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\App as WAMP;
+use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
 
 /**
  * This is an event in the context of a topicURI
diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponent.php b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
index c02dd00..cbc66a8 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponent.php
+++ b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
@@ -1,6 +1,5 @@
 <?php
 namespace Ratchet\Component\WAMP;
-use Ratchet\Component\ComponentInterface;
 use Ratchet\Component\WebSocket\WebSocketComponentInterface;
 use Ratchet\Resource\ConnectionInterface;
 use Ratchet\Resource\Command\Composite;
diff --git a/src/Ratchet/Component/WebSocket/Command/Action/Ping.php b/src/Ratchet/Component/WebSocket/Command/Action/Ping.php
index 4632e90..bac184d 100644
--- a/src/Ratchet/Component/WebSocket/Command/Action/Ping.php
+++ b/src/Ratchet/Component/WebSocket/Command/Action/Ping.php
@@ -1,6 +1,6 @@
 <?php
 namespace Ratchet\Component\WebSocket\Command\Action;
-use Ratchet\Resource\Command\ActionTemplate;
+use Ratchet\Resource\Command\Action\ActionTemplate;
 use Ratchet\Component\ComponentInterface;
 
 /**
diff --git a/src/Ratchet/Component/WebSocket/Command/Action/Pong.php b/src/Ratchet/Component/WebSocket/Command/Action/Pong.php
index db8b3ef..6cd5664 100644
--- a/src/Ratchet/Component/WebSocket/Command/Action/Pong.php
+++ b/src/Ratchet/Component/WebSocket/Command/Action/Pong.php
@@ -1,6 +1,6 @@
 <?php
 namespace Ratchet\Component\WebSocket\Command\Action;
-use Ratchet\Resource\Command\ActionTemplate;
+use Ratchet\Resource\Command\Action\ActionTemplate;
 use Ratchet\Component\ComponentInterface;
 
 /**
diff --git a/tests/Ratchet/Tests/SocketTest.php b/tests/Ratchet/Tests/SocketTest.php
index c9d7612..1ad146c 100644
--- a/tests/Ratchet/Tests/SocketTest.php
+++ b/tests/Ratchet/Tests/SocketTest.php
@@ -2,7 +2,6 @@
 namespace Ratchet\Tests;
 use Ratchet\Tests\Mock\FakeSocket as Socket;
 use Ratchet\Socket as RealSocket;
-use Ratchet\Tests\Mock\Application as TestApp;
 
 /**
  * @covers Ratchet\Socket