diff --git a/src/Socket/AbstractConnectionDecorator.php b/src/Socket/AbstractConnectionDecorator.php
index 9707951..ea3def4 100644
--- a/src/Socket/AbstractConnectionDecorator.php
+++ b/src/Socket/AbstractConnectionDecorator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 /**
  * Wraps ConnectionInterface objects via the decorator pattern but allows
diff --git a/src/Socket/App.php b/src/Socket/App.php
index b9fd5a9..21f09e5 100644
--- a/src/Socket/App.php
+++ b/src/Socket/App.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 use React\EventLoop\LoopInterface;
 use React\EventLoop\Factory as LoopFactory;
 use React\Socket\Server as Reactor;
diff --git a/src/Socket/ComponentInterface.php b/src/Socket/ComponentInterface.php
index 37e41b1..bc7f091 100644
--- a/src/Socket/ComponentInterface.php
+++ b/src/Socket/ComponentInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 /**
  * This is the interface to build a Ratchet application with.
diff --git a/src/Socket/ConnectionInterface.php b/src/Socket/ConnectionInterface.php
index 7213811..e976f19 100644
--- a/src/Socket/ConnectionInterface.php
+++ b/src/Socket/ConnectionInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 /**
  * The version of Ratchet being used
diff --git a/src/Socket/MessageComponentInterface.php b/src/Socket/MessageComponentInterface.php
index b4a92e2..3eba85f 100644
--- a/src/Socket/MessageComponentInterface.php
+++ b/src/Socket/MessageComponentInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 interface MessageComponentInterface extends ComponentInterface, MessageInterface {
 }
diff --git a/src/Socket/MessageInterface.php b/src/Socket/MessageInterface.php
index 1486323..b2c5d80 100644
--- a/src/Socket/MessageInterface.php
+++ b/src/Socket/MessageInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 interface MessageInterface {
     /**
diff --git a/tests/helpers/Ratchet/AbstractMessageComponentTestCase.php b/tests/helpers/Ratchet/AbstractMessageComponentTestCase.php
index 8c298e5..7358f92 100644
--- a/tests/helpers/Ratchet/AbstractMessageComponentTestCase.php
+++ b/tests/helpers/Ratchet/AbstractMessageComponentTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 
 abstract class AbstractMessageComponentTestCase extends \PHPUnit_Framework_TestCase {
     protected $_app;
diff --git a/tests/helpers/Ratchet/NullComponent.php b/tests/helpers/Ratchet/NullComponent.php
index e38cc88..08cba67 100644
--- a/tests/helpers/Ratchet/NullComponent.php
+++ b/tests/helpers/Ratchet/NullComponent.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 use mfmdevsystem\socket\ConnectionInterface;
 use mfmdevsystem\socket\MessageComponentInterface;
 use mfmdevsystem\socket\WebSocket\WsServerInterface;
diff --git a/tests/unit/AbstractConnectionDecoratorTest.php b/tests/unit/AbstractConnectionDecoratorTest.php
index b877298..247c544 100644
--- a/tests/unit/AbstractConnectionDecoratorTest.php
+++ b/tests/unit/AbstractConnectionDecoratorTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet;
+namespace mfmdevsystem\socket;
 use mfmdevsystem\socket\Mock\ConnectionDecorator;
 
 /**