diff --git a/composer.json b/composer.json
index e8c64c4..9a352fe 100644
--- a/composer.json
+++ b/composer.json
@@ -19,11 +19,11 @@
     }
   , "autoload": {
         "psr-4": {
-            "Ratchet\\WebSocket\\": "src"
+            "Ratchet\\RFC6455\\": "src"
         }
     }
   , "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.4.2"
       , "guzzle/http": "~3.6"
     }
 }
diff --git a/src/Encoding/ToggleableValidator.php b/src/Encoding/ToggleableValidator.php
index edf14bc..46152e4 100644
--- a/src/Encoding/ToggleableValidator.php
+++ b/src/Encoding/ToggleableValidator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Encoding;
+namespace Ratchet\RFC6455\Encoding;
 
 class ToggleableValidator implements ValidatorInterface {
     /**
diff --git a/src/Encoding/Validator.php b/src/Encoding/Validator.php
index 40de394..7165faa 100644
--- a/src/Encoding/Validator.php
+++ b/src/Encoding/Validator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Encoding;
+namespace Ratchet\RFC6455\Encoding;
 
 /**
  * This class handled encoding validation
diff --git a/src/Encoding/ValidatorInterface.php b/src/Encoding/ValidatorInterface.php
index 374f220..b6f5c84 100644
--- a/src/Encoding/ValidatorInterface.php
+++ b/src/Encoding/ValidatorInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Encoding;
+namespace Ratchet\RFC6455\Encoding;
 
 interface ValidatorInterface {
     /**
diff --git a/src/Version/DataInterface.php b/src/Version/DataInterface.php
index bec1211..cf7a15b 100644
--- a/src/Version/DataInterface.php
+++ b/src/Version/DataInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version;
+namespace Ratchet\RFC6455\Version;
 
 interface DataInterface {
     /**
diff --git a/src/Version/FrameInterface.php b/src/Version/FrameInterface.php
index 4eafb82..b68bbc8 100644
--- a/src/Version/FrameInterface.php
+++ b/src/Version/FrameInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version;
+namespace Ratchet\RFC6455\Version;
 
 interface FrameInterface extends DataInterface {
     /**
diff --git a/src/Version/MessageInterface.php b/src/Version/MessageInterface.php
index 476c091..a205a4c 100644
--- a/src/Version/MessageInterface.php
+++ b/src/Version/MessageInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version;
+namespace Ratchet\RFC6455\Version;
 
 interface MessageInterface extends DataInterface {
     /**
diff --git a/src/Version/RFC6455.php b/src/Version/RFC6455.php
index 23e166c..e70e209 100644
--- a/src/Version/RFC6455.php
+++ b/src/Version/RFC6455.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version;
+namespace Ratchet\RFC6455\Version;
 use Ratchet\ConnectionInterface;
 use Ratchet\MessageInterface;
 use Ratchet\WebSocket\Version\RFC6455\HandshakeVerifier;
diff --git a/src/Version/RFC6455/Connection.php b/src/Version/RFC6455/Connection.php
index a17e382..be6d63f 100644
--- a/src/Version/RFC6455/Connection.php
+++ b/src/Version/RFC6455/Connection.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\WebSocket\Version\RFC6455;
+namespace Ratchet\RFC6455\Version\RFC6455;
 use Ratchet\AbstractConnectionDecorator;
-use Ratchet\WebSocket\Version\DataInterface;
+use Ratchet\RFC6455\Version\DataInterface;
 
 /**
  * {@inheritdoc}
diff --git a/src/Version/RFC6455/Frame.php b/src/Version/RFC6455/Frame.php
index 1a92c1f..768bee0 100644
--- a/src/Version/RFC6455/Frame.php
+++ b/src/Version/RFC6455/Frame.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\WebSocket\Version\RFC6455;
-use Ratchet\WebSocket\Version\FrameInterface;
+namespace Ratchet\RFC6455\Version\RFC6455;
+use Ratchet\RFC6455\Version\FrameInterface;
 
 class Frame implements FrameInterface {
     const OP_CONTINUE =  0;
diff --git a/src/Version/RFC6455/HandshakeVerifier.php b/src/Version/RFC6455/HandshakeVerifier.php
index fd783f6..0ccaf68 100644
--- a/src/Version/RFC6455/HandshakeVerifier.php
+++ b/src/Version/RFC6455/HandshakeVerifier.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version\RFC6455;
+namespace Ratchet\RFC6455\Version\RFC6455;
 use Guzzle\Http\Message\RequestInterface;
 
 /**
diff --git a/src/Version/RFC6455/Message.php b/src/Version/RFC6455/Message.php
index a839f2d..0197b33 100644
--- a/src/Version/RFC6455/Message.php
+++ b/src/Version/RFC6455/Message.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\WebSocket\Version\RFC6455;
-use Ratchet\WebSocket\Version\MessageInterface;
-use Ratchet\WebSocket\Version\FrameInterface;
+namespace Ratchet\RFC6455\Version\RFC6455;
+use Ratchet\RFC6455\Version\MessageInterface;
+use Ratchet\RFC6455\Version\FrameInterface;
 
 class Message implements MessageInterface, \Countable {
     /**
diff --git a/src/Version/VersionInterface.php b/src/Version/VersionInterface.php
index 5bbe534..4fdb9f4 100644
--- a/src/Version/VersionInterface.php
+++ b/src/Version/VersionInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\WebSocket\Version;
+namespace Ratchet\RFC6455\Version;
 use Ratchet\MessageInterface;
 use Ratchet\ConnectionInterface;
 use Guzzle\Http\Message\RequestInterface;