diff --git a/lib/Ratchet/Application/WebSocket/AppInterface.php b/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
similarity index 55%
rename from lib/Ratchet/Application/WebSocket/AppInterface.php
rename to lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
index bb35340..4b85a49 100644
--- a/lib/Ratchet/Application/WebSocket/AppInterface.php
+++ b/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
@@ -1,22 +1,20 @@
 <?php
 namespace Ratchet\Application\WebSocket;
-use Ratchet\ObserverInterface;
-use Ratchet\SocketInterface;
+use Ratchet\Application\ApplicationInterface;
 
 /**
  * @todo App interfaces this (optionally) if is meant for WebSocket
  * @todo WebSocket checks if instanceof AppInterface, if so uses getSubProtocol() when doing handshake
+ * @todo Pick a better name for this...
  */
-interface AppInterface extends ObserverInterface {
+interface WebSocketAppInterface extends ApplicationInterface {
+    /**
+     * @param string
+     */
+    function setHeaders($headers);
+
     /**
      * @return string
      */
     function getSubProtocol();
-
-    /**
-     * @param Ratchet\SocketInterface
-     * @param string
-     * @return Ratchet\Resource\Command\CommandInterface|null
-     */
-    function onOpen(SocketInterface $conn, $headers);
 }
\ No newline at end of file