diff --git a/lib/Ratchet/Application/ApplicationInterface.php b/lib/Ratchet/Application/ApplicationInterface.php
index 91b039c..a47306b 100644
--- a/lib/Ratchet/Application/ApplicationInterface.php
+++ b/lib/Ratchet/Application/ApplicationInterface.php
@@ -1,9 +1,8 @@
 <?php
 namespace Ratchet\Application;
-//use Ratchet\ObserverInterface;
 use Ratchet\Resource\Connection;
 
-interface ApplicationInterface /*extends ObserverInterface*/ {
+interface ApplicationInterface {
     /**
      * Decorator pattern
      * @param Ratchet\ObserverInterface Application to wrap in protocol
diff --git a/lib/Ratchet/Application/Server/App.php b/lib/Ratchet/Application/Server/App.php
index 3d72ad0..d0ab70f 100644
--- a/lib/Ratchet/Application/Server/App.php
+++ b/lib/Ratchet/Application/Server/App.php
@@ -27,7 +27,7 @@ class App implements ApplicationInterface {
     protected $_app;
 
     /**
-     * @param Ratchet\ObserverInterface
+     * @param Ratchet\Application\ApplicationInterface
      */
     public function __construct(ApplicationInterface $application = null) {
         if (null === $application) {
diff --git a/lib/Ratchet/Application/WebSocket/App.php b/lib/Ratchet/Application/WebSocket/App.php
index 93dd144..cb4938c 100644
--- a/lib/Ratchet/Application/WebSocket/App.php
+++ b/lib/Ratchet/Application/WebSocket/App.php
@@ -15,7 +15,7 @@ use Ratchet\Application\WebSocket\Util\HTTP;
  * @link http://ca.php.net/manual/en/ref.http.php
  * @todo Make sure this works both ways (client/server) as stack needs to exist on client for framing
  * @todo Learn about closing the socket.  A message has to be sent prior to closing - does the message get sent onClose event or CloseConnection command?
- * @todo Consider chaning this class to a State Pattern.  If a ObserverInterface is passed in __construct, do what is there now.  If it's an AppInterface change behaviour of socket interaction (onOpen, handshake, etc)
+ * @todo Consider chaning this class to a State Pattern.  If a WS App interface is passed use different state for additional methods used
  */
 class App implements ApplicationInterface, ConfiguratorInterface {
     /**
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php b/lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
index 301086a..e8035f2 100644
--- a/lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
+++ b/lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
@@ -1,8 +1,7 @@
 <?php
 namespace Ratchet\Application\WebSocket\Command\Action;
-use Ratchet\SocketInterface;
 use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\ObserverInterface;
+use Ratchet\Application\ApplicationInterface;
 
 class Disconnect extends SendMessage {
     protected $_code = 1000;
@@ -13,7 +12,7 @@ class Disconnect extends SendMessage {
         // re-do message based on code
     }
 
-    public function execute(ObserverInterface $scope = null) {
+    public function execute(ApplicationInterface $scope = null) {
         parent::execute();
         $this->_socket->close();
     }
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Ping.php b/lib/Ratchet/Application/WebSocket/Command/Action/Ping.php
index ec550e7..5fc0737 100644
--- a/lib/Ratchet/Application/WebSocket/Command/Action/Ping.php
+++ b/lib/Ratchet/Application/WebSocket/Command/Action/Ping.php
@@ -1,9 +1,9 @@
 <?php
 namespace Ratchet\Application\WebSocket\Command\Action;
 use Ratchet\Resource\Command\ActionTemplate;
-use Ratchet\ObserverInterface;
+use Ratchet\Application\ApplicationInterface;
 
 class Ping extends ActionTemplate {
-    public function execute(ObserverInterface $scope = null) {
+    public function execute(ApplicationInterface $scope = null) {
     }
 }
\ No newline at end of file
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Pong.php b/lib/Ratchet/Application/WebSocket/Command/Action/Pong.php
index 397a594..e010fc6 100644
--- a/lib/Ratchet/Application/WebSocket/Command/Action/Pong.php
+++ b/lib/Ratchet/Application/WebSocket/Command/Action/Pong.php
@@ -1,9 +1,9 @@
 <?php
 namespace Ratchet\Application\WebSocket\Command\Action;
 use Ratchet\Resource\Command\ActionTemplate;
-use Ratchet\ObserverInterface;
+use Ratchet\Application\ApplicationInterface;
 
 class Pong extends ActionTemplate {
-    public function execute(ObserverInterface $scope = null) {
+    public function execute(ApplicationInterface $scope = null) {
     }
 }
\ No newline at end of file
diff --git a/lib/Ratchet/ObserverInterface.php b/lib/Ratchet/ObserverInterface.php
index 898e809..7fa54f2 100644
--- a/lib/Ratchet/ObserverInterface.php
+++ b/lib/Ratchet/ObserverInterface.php
@@ -5,6 +5,7 @@ namespace Ratchet;
  * Observable/Observer design pattern interface for handing events on a socket
  * @todo Consider an onDisconnect method for a server-side close()'ing of a connection - onClose would be client side close()
  * @todo Is this interface needed anymore?
+ * @deprecated
  */
 interface ObserverInterface {
     /**
diff --git a/lib/Ratchet/Resource/Command/Action/Null.php b/lib/Ratchet/Resource/Command/Action/Null.php
index 78a6e16..a23f703 100644
--- a/lib/Ratchet/Resource/Command/Action/Null.php
+++ b/lib/Ratchet/Resource/Command/Action/Null.php
@@ -1,12 +1,12 @@
 <?php
 namespace Ratchet\Resource\Command\Action;
 use Ratchet\Resource\Command\ActionTemplate;
-use Ratchet\ObserverInterface;
+use Ratchet\Application\ApplicationInterface;
 
 /**
  * Null pattern - execution does nothing, something needs to be passed back though
  */
 class Null extends ActionTemplate {
-    public function execute(ObserverInterface $scope = null) {
+    public function execute(ApplicationInterface $scope = null) {
     }
 }
\ No newline at end of file
diff --git a/lib/Ratchet/Resource/Command/Action/SendMessage.php b/lib/Ratchet/Resource/Command/Action/SendMessage.php
index 7c65533..8cdf57a 100644
--- a/lib/Ratchet/Resource/Command/Action/SendMessage.php
+++ b/lib/Ratchet/Resource/Command/Action/SendMessage.php
@@ -1,7 +1,6 @@
 <?php
 namespace Ratchet\Resource\Command\Action;
 use Ratchet\Resource\Command\ActionTemplate;
-//use Ratchet\ObserverInterface;
 use Ratchet\Application\ApplicationInterface;
 
 /**
diff --git a/lib/Ratchet/Resource/Command/CommandInterface.php b/lib/Ratchet/Resource/Command/CommandInterface.php
index e0f4992..1464267 100644
--- a/lib/Ratchet/Resource/Command/CommandInterface.php
+++ b/lib/Ratchet/Resource/Command/CommandInterface.php
@@ -1,6 +1,5 @@
 <?php
 namespace Ratchet\Resource\Command;
-//use Ratchet\ObserverInterface;
 use Ratchet\Application\ApplicationInterface;
 
 /**
diff --git a/lib/Ratchet/Resource/Command/Composite.php b/lib/Ratchet/Resource/Command/Composite.php
index 0f55583..1820c3f 100644
--- a/lib/Ratchet/Resource/Command/Composite.php
+++ b/lib/Ratchet/Resource/Command/Composite.php
@@ -1,6 +1,5 @@
 <?php
 namespace Ratchet\Resource\Command;
-//use Ratchet\ObserverInterface;
 use Ratchet\Application\ApplicationInterface;
 
 class Composite extends \SplQueue implements CommandInterface {