diff --git a/src/Ratchet/Component/WAMP/Command/Action/Prefix.php b/src/Ratchet/Component/WAMP/Command/Action/Prefix.php
index 49b9003..047c1ea 100644
--- a/src/Ratchet/Component/WAMP/Command/Action/Prefix.php
+++ b/src/Ratchet/Component/WAMP/Command/Action/Prefix.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;
 
 /**
  * Send a curie to uri mapping to the client
diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponent.php b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
index 630e19c..c02dd00 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponent.php
+++ b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Component\WAMP;
 use Ratchet\Component\ComponentInterface;
-use Ratchet\Component\WebSocket\WebSocketAppInterface;
+use Ratchet\Component\WebSocket\WebSocketComponentInterface;
 use Ratchet\Resource\ConnectionInterface;
 use Ratchet\Resource\Command\Composite;
 use Ratchet\Resource\Command\CommandInterface;
@@ -25,7 +25,7 @@ use Ratchet\Component\WAMP\Command\Action\Prefix;
  * @link http://www.tavendo.de/autobahn/protocol.html
  * @link https://raw.github.com/oberstet/Autobahn/master/lib/javascript/autobahn.js
  */
-class WAMPServerComponent implements WebSocketAppInterface {
+class WAMPServerComponent implements WebSocketComponentInterface {
     const MSG_WELCOME     = 0;
     const MSG_PREFIX      = 1;
     const MSG_CALL        = 2;
diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php b/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php
index 7e47de8..180ad2a 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php
+++ b/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php
@@ -9,26 +9,6 @@ use Ratchet\Resource\ConnectionInterface;
  * @todo Thought: URI as class.  Class has short and long version stored (if as prefix)
  */
 interface WAMPServerComponentInterface extends ComponentInterface {
-    /**
-     * When a new connection is opened it will be passed to this method
-     * @param Ratchet\Resource\Connection
-     */
-    function onOpen(ConnectionInterface $conn);
-
-    /**
-     * The user closed their connection
-     * @param Ratchet\Resource\Connection
-     * @return Ratchet\Resource\Command\CommandInterface|null
-     */
-    function onClose(ConnectionInterface $conn);
-
-    /**
-     * @param Ratchet\Resource\Connection
-     * @param \Exception
-     * @return Ratchet\Resource\Command\CommandInterface|null
-     */
-    function onError(ConnectionInterface $conn, \Exception $e);
-
     /**
      * An RPC call has been received
      * @param Ratchet\Resource\Connection