diff --git a/lib/Predis/Network/ComposableStreamConnection.php b/lib/Predis/Network/ComposableStreamConnection.php
index 5676791a..62ff6730 100644
--- a/lib/Predis/Network/ComposableStreamConnection.php
+++ b/lib/Predis/Network/ComposableStreamConnection.php
@@ -5,8 +5,8 @@ namespace Predis\Network;
 use Predis\IConnectionParameters;
 use Predis\CommunicationException;
 use Predis\Commands\ICommand;
-use Predis\Protocols\IProtocolProcessor;
-use Predis\Protocols\Text\TextProtocol;
+use Predis\Protocol\IProtocolProcessor;
+use Predis\Protocol\Text\TextProtocol;
 
 class ComposableStreamConnection extends StreamConnection implements IConnectionComposable {
     private $_protocol;
diff --git a/lib/Predis/Network/IConnectionComposable.php b/lib/Predis/Network/IConnectionComposable.php
index 6af5816f..250feaf7 100644
--- a/lib/Predis/Network/IConnectionComposable.php
+++ b/lib/Predis/Network/IConnectionComposable.php
@@ -2,7 +2,7 @@
 
 namespace Predis\Network;
 
-use Predis\Protocols\IProtocolProcessor;
+use Predis\Protocol\IProtocolProcessor;
 
 interface IConnectionComposable extends IConnectionSingle {
     public function setProtocol(IProtocolProcessor $protocol);
diff --git a/lib/Predis/Protocols/ICommandSerializer.php b/lib/Predis/Protocol/ICommandSerializer.php
similarity index 81%
rename from lib/Predis/Protocols/ICommandSerializer.php
rename to lib/Predis/Protocol/ICommandSerializer.php
index 557639c2..9e4b5559 100644
--- a/lib/Predis/Protocols/ICommandSerializer.php
+++ b/lib/Predis/Protocol/ICommandSerializer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocol;
 
 use Predis\Commands\ICommand;
 
diff --git a/lib/Predis/Protocols/IComposableProtocolProcessor.php b/lib/Predis/Protocol/IComposableProtocolProcessor.php
similarity index 90%
rename from lib/Predis/Protocols/IComposableProtocolProcessor.php
rename to lib/Predis/Protocol/IComposableProtocolProcessor.php
index fa32054d..b0b283c7 100644
--- a/lib/Predis/Protocols/IComposableProtocolProcessor.php
+++ b/lib/Predis/Protocol/IComposableProtocolProcessor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocol;
 
 interface IComposableProtocolProcessor extends IProtocolProcessor {
     public function setSerializer(ICommandSerializer $serializer);
diff --git a/lib/Predis/Protocols/IProtocolProcessor.php b/lib/Predis/Protocol/IProtocolProcessor.php
similarity index 90%
rename from lib/Predis/Protocols/IProtocolProcessor.php
rename to lib/Predis/Protocol/IProtocolProcessor.php
index e974ec16..48b9cd56 100644
--- a/lib/Predis/Protocols/IProtocolProcessor.php
+++ b/lib/Predis/Protocol/IProtocolProcessor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocol;
 
 use Predis\Commands\ICommand;
 use Predis\Network\IConnectionComposable;
diff --git a/lib/Predis/Protocols/IResponseHandler.php b/lib/Predis/Protocol/IResponseHandler.php
similarity index 84%
rename from lib/Predis/Protocols/IResponseHandler.php
rename to lib/Predis/Protocol/IResponseHandler.php
index 898f5811..d895d056 100644
--- a/lib/Predis/Protocols/IResponseHandler.php
+++ b/lib/Predis/Protocol/IResponseHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocol;
 
 use Predis\Network\IConnectionComposable;
 
diff --git a/lib/Predis/Protocols/IResponseReader.php b/lib/Predis/Protocol/IResponseReader.php
similarity index 83%
rename from lib/Predis/Protocols/IResponseReader.php
rename to lib/Predis/Protocol/IResponseReader.php
index 62b3d5d7..15dd3bd5 100644
--- a/lib/Predis/Protocols/IResponseReader.php
+++ b/lib/Predis/Protocol/IResponseReader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocol;
 
 use Predis\Network\IConnectionComposable;
 
diff --git a/lib/Predis/Protocols/Text/ComposableTextProtocol.php b/lib/Predis/Protocol/Text/ComposableTextProtocol.php
similarity index 92%
rename from lib/Predis/Protocols/Text/ComposableTextProtocol.php
rename to lib/Predis/Protocol/Text/ComposableTextProtocol.php
index 856352c0..3fe252b9 100644
--- a/lib/Predis/Protocols/Text/ComposableTextProtocol.php
+++ b/lib/Predis/Protocol/Text/ComposableTextProtocol.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Commands\ICommand;
-use Predis\Protocols\IResponseReader;
-use Predis\Protocols\ICommandSerializer;
-use Predis\Protocols\IComposableProtocolProcessor;
+use Predis\Protocol\IResponseReader;
+use Predis\Protocol\ICommandSerializer;
+use Predis\Protocol\IComposableProtocolProcessor;
 use Predis\Network\IConnectionComposable;
 
 class ComposableTextProtocol implements IComposableProtocolProcessor {
diff --git a/lib/Predis/Protocols/Text/ResponseBulkHandler.php b/lib/Predis/Protocol/Text/ResponseBulkHandler.php
similarity index 90%
rename from lib/Predis/Protocols/Text/ResponseBulkHandler.php
rename to lib/Predis/Protocol/Text/ResponseBulkHandler.php
index 89030a94..2a873bb8 100644
--- a/lib/Predis/Protocols/Text/ResponseBulkHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseBulkHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseBulkHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/ResponseErrorHandler.php b/lib/Predis/Protocol/Text/ResponseErrorHandler.php
similarity index 79%
rename from lib/Predis/Protocols/Text/ResponseErrorHandler.php
rename to lib/Predis/Protocol/Text/ResponseErrorHandler.php
index a66c7043..731984c7 100644
--- a/lib/Predis/Protocols/Text/ResponseErrorHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseErrorHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\ServerException;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseErrorHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php b/lib/Predis/Protocol/Text/ResponseErrorSilentHandler.php
similarity index 79%
rename from lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php
rename to lib/Predis/Protocol/Text/ResponseErrorSilentHandler.php
index 674540c2..3f7f2eae 100644
--- a/lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseErrorSilentHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\ResponseError;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseErrorSilentHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/ResponseIntegerHandler.php b/lib/Predis/Protocol/Text/ResponseIntegerHandler.php
similarity index 88%
rename from lib/Predis/Protocols/Text/ResponseIntegerHandler.php
rename to lib/Predis/Protocol/Text/ResponseIntegerHandler.php
index e11f4f29..ef094e24 100644
--- a/lib/Predis/Protocols/Text/ResponseIntegerHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseIntegerHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseIntegerHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php b/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
similarity index 94%
rename from lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php
rename to lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
index 1eed5921..742f7fc7 100644
--- a/lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseMultiBulkHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseMultiBulkHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php b/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
similarity index 89%
rename from lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php
rename to lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
index 7e90fe9e..cc5e98af 100644
--- a/lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseMultiBulkStreamHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 use Predis\Iterators\MultiBulkResponseSimple;
 
diff --git a/lib/Predis/Protocols/Text/ResponseStatusHandler.php b/lib/Predis/Protocol/Text/ResponseStatusHandler.php
similarity index 85%
rename from lib/Predis/Protocols/Text/ResponseStatusHandler.php
rename to lib/Predis/Protocol/Text/ResponseStatusHandler.php
index c22922b7..21fef43c 100644
--- a/lib/Predis/Protocols/Text/ResponseStatusHandler.php
+++ b/lib/Predis/Protocol/Text/ResponseStatusHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\ResponseQueued;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseStatusHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/Text/TextCommandSerializer.php b/lib/Predis/Protocol/Text/TextCommandSerializer.php
similarity index 89%
rename from lib/Predis/Protocols/Text/TextCommandSerializer.php
rename to lib/Predis/Protocol/Text/TextCommandSerializer.php
index f5acf2ab..5725cebb 100644
--- a/lib/Predis/Protocols/Text/TextCommandSerializer.php
+++ b/lib/Predis/Protocol/Text/TextCommandSerializer.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Commands\ICommand;
-use Predis\Protocols\ICommandSerializer;
+use Predis\Protocol\ICommandSerializer;
 
 class TextCommandSerializer implements ICommandSerializer {
     public function serialize(ICommand $command) {
diff --git a/lib/Predis/Protocols/Text/TextProtocol.php b/lib/Predis/Protocol/Text/TextProtocol.php
similarity index 97%
rename from lib/Predis/Protocols/Text/TextProtocol.php
rename to lib/Predis/Protocol/Text/TextProtocol.php
index 63b3f43e..f42c1fac 100644
--- a/lib/Predis/Protocols/Text/TextProtocol.php
+++ b/lib/Predis/Protocol/Text/TextProtocol.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ResponseError;
@@ -8,7 +8,7 @@ use Predis\ResponseQueued;
 use Predis\ServerException;
 use Predis\ProtocolException;
 use Predis\Commands\ICommand;
-use Predis\Protocols\IProtocolProcessor;
+use Predis\Protocol\IProtocolProcessor;
 use Predis\Network\IConnectionComposable;
 use Predis\Iterators\MultiBulkResponseSimple;
 
diff --git a/lib/Predis/Protocols/Text/TextResponseReader.php b/lib/Predis/Protocol/Text/TextResponseReader.php
similarity index 94%
rename from lib/Predis/Protocols/Text/TextResponseReader.php
rename to lib/Predis/Protocol/Text/TextResponseReader.php
index b53f1dd3..af29b4c3 100644
--- a/lib/Predis/Protocols/Text/TextResponseReader.php
+++ b/lib/Predis/Protocol/Text/TextResponseReader.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Predis\Protocols\Text;
+namespace Predis\Protocol\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
-use Predis\Protocols\IResponseReader;
-use Predis\Protocols\IResponseHandler;
+use Predis\Protocol\IResponseReader;
+use Predis\Protocol\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class TextResponseReader implements IResponseReader {
diff --git a/test/ClientFeaturesTest.php b/test/ClientFeaturesTest.php
index 0cb00312..fa2976f3 100644
--- a/test/ClientFeaturesTest.php
+++ b/test/ClientFeaturesTest.php
@@ -158,7 +158,7 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     function testResponseQueued() {
         $response = new \Predis\ResponseQueued();
         $this->assertInstanceOf('\Predis\IReplyObject', $response);
-        $this->assertEquals(\Predis\Protocols\Text\TextProtocol::QUEUED, (string)$response);
+        $this->assertEquals(\Predis\Protocol\Text\TextProtocol::QUEUED, (string)$response);
     }
 
 
@@ -273,30 +273,30 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     }
 
 
-    /* Predis\Protocols\TextResponseReader */
+    /* Predis\Protocol\TextResponseReader */
 
     function testResponseReader_OptionIterableMultiBulkReplies() {
-        $protocol = new Predis\Protocols\Text\ComposableTextProtocol();
+        $protocol = new Predis\Protocol\Text\ComposableTextProtocol();
         $reader = $protocol->getReader();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
 
         $reader->setHandler(
-            \Predis\Protocols\Text\TextProtocol::PREFIX_MULTI_BULK,
-            new \Predis\Protocols\Text\ResponseMultiBulkHandler()
+            \Predis\Protocol\Text\TextProtocol::PREFIX_MULTI_BULK,
+            new \Predis\Protocol\Text\ResponseMultiBulkHandler()
         );
         $connection->writeBytes("KEYS *\r\n");
         $this->assertInternalType('array', $reader->read($connection));
 
         $reader->setHandler(
-            \Predis\Protocols\Text\TextProtocol::PREFIX_MULTI_BULK,
-            new \Predis\Protocols\Text\ResponseMultiBulkStreamHandler()
+            \Predis\Protocol\Text\TextProtocol::PREFIX_MULTI_BULK,
+            new \Predis\Protocol\Text\ResponseMultiBulkStreamHandler()
         );
         $connection->writeBytes("KEYS *\r\n");
         $this->assertInstanceOf('\Iterator', $reader->read($connection));
     }
 
     function testResponseReader_OptionExceptionOnError() {
-        $protocol = new Predis\Protocols\Text\ComposableTextProtocol();
+        $protocol = new Predis\Protocol\Text\ComposableTextProtocol();
         $reader = $protocol->getReader();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
 
@@ -305,8 +305,8 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $reader->read($connection);
 
         $reader->setHandler(
-            \Predis\Protocols\Text\TextProtocol::PREFIX_ERROR,
-            new \Predis\Protocols\Text\ResponseErrorSilentHandler()
+            \Predis\Protocol\Text\TextProtocol::PREFIX_ERROR,
+            new \Predis\Protocol\Text\ResponseErrorSilentHandler()
         );
         $connection->writeBytes($rawCmdUnexpected);
         $errorReply = $reader->read($connection);
@@ -314,8 +314,8 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $this->assertEquals(RC::EXCEPTION_WRONG_TYPE, $errorReply->getMessage());
 
         $reader->setHandler(
-            \Predis\Protocols\Text\TextProtocol::PREFIX_ERROR,
-            new \Predis\Protocols\Text\ResponseErrorHandler()
+            \Predis\Protocol\Text\TextProtocol::PREFIX_ERROR,
+            new \Predis\Protocol\Text\ResponseErrorHandler()
         );
         RC::testForServerException($this, RC::EXCEPTION_WRONG_TYPE, function()
             use ($connection, $rawCmdUnexpected) {
@@ -326,7 +326,7 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     }
 
     function testResponseReader_EmptyBulkResponse() {
-        $protocol = new \Predis\Protocols\Text\ComposableTextProtocol();
+        $protocol = new \Predis\Protocol\Text\ComposableTextProtocol();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
         $client = new \Predis\Client($connection);