diff --git a/trunk/configure b/trunk/configure
index b4fb78375..3f1234704 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -157,7 +157,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="PROTOCOL" 
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
-MODULE_FILES=("srs_protocol_amf0" "srs_rtmp_io" "srs_rtmp_stack"
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
         "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
         "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
         "srs_kafka_stack")
diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp
index 5da9e83ce..7dc1aa176 100755
--- a/trunk/ide/srs_upp/srs_upp.upp
+++ b/trunk/ide/srs_upp/srs_upp.upp
@@ -64,8 +64,8 @@ file
     ../../src/protocol/srs_protocol_json.cpp,
     ../../src/protocol/srs_rtmp_handshake.hpp,
     ../../src/protocol/srs_rtmp_handshake.cpp,
-    ../../src/protocol/srs_rtmp_io.hpp,
-    ../../src/protocol/srs_rtmp_io.cpp,
+    ../../src/protocol/srs_protocol_io.hpp,
+    ../../src/protocol/srs_protocol_io.cpp,
     ../../src/protocol/srs_rtmp_msg_array.hpp,
     ../../src/protocol/srs_rtmp_msg_array.cpp,
     ../../src/protocol/srs_rtmp_stack.hpp,
diff --git a/trunk/ide/srs_vs2010/srs.vcxproj b/trunk/ide/srs_vs2010/srs.vcxproj
index 46aa35740..d4167e456 100755
--- a/trunk/ide/srs_vs2010/srs.vcxproj
+++ b/trunk/ide/srs_vs2010/srs.vcxproj
@@ -124,7 +124,7 @@
     <ClInclude Include="..\..\src\protocol\srs_protocol_amf0.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_protocol_stream.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
-    <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
+    <ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" />
@@ -207,7 +207,7 @@
     <ClCompile Include="..\..\src\protocol\srs_protocol_amf0.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_protocol_stream.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
-    <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />
+    <ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" />
diff --git a/trunk/ide/srs_vs2010/srs.vcxproj.filters b/trunk/ide/srs_vs2010/srs.vcxproj.filters
index a26c5277f..f25ef0a42 100755
--- a/trunk/ide/srs_vs2010/srs.vcxproj.filters
+++ b/trunk/ide/srs_vs2010/srs.vcxproj.filters
@@ -211,7 +211,7 @@
     <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp">
       <Filter>srs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp">
+    <ClCompile Include="..\..\src\protocol\srs_protocol_io.cpp">
       <Filter>srs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp">
@@ -405,7 +405,7 @@
     <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp">
       <Filter>srs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp">
+    <ClInclude Include="..\..\src\protocol\srs_protocol_io.hpp">
       <Filter>srs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp">
diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
index 0552e4198..78d9a3d59 100644
--- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
+++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
@@ -32,7 +32,7 @@
 		3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */; };
 		3C1232421AAE81A400CE8F6C /* srs_protocol_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */; };
 		3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; };
-		3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; };
+		3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */; };
 		3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
 		3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; };
 		3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */; };
@@ -177,8 +177,8 @@
 		3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_amf0.hpp; path = ../../../src/protocol/srs_protocol_amf0.hpp; sourceTree = "<group>"; };
 		3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_handshake.cpp; path = ../../../src/protocol/srs_rtmp_handshake.cpp; sourceTree = "<group>"; };
 		3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_handshake.hpp; path = ../../../src/protocol/srs_rtmp_handshake.hpp; sourceTree = "<group>"; };
-		3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_io.cpp; path = ../../../src/protocol/srs_rtmp_io.cpp; sourceTree = "<group>"; };
-		3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_io.hpp; path = ../../../src/protocol/srs_rtmp_io.hpp; sourceTree = "<group>"; };
+		3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_io.cpp; path = ../../../src/protocol/srs_protocol_io.cpp; sourceTree = "<group>"; };
+		3C1232361AAE81A400CE8F6C /* srs_protocol_io.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_io.hpp; path = ../../../src/protocol/srs_protocol_io.hpp; sourceTree = "<group>"; };
 		3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_msg_array.cpp; path = ../../../src/protocol/srs_rtmp_msg_array.cpp; sourceTree = "<group>"; };
 		3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; };
 		3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; };
@@ -512,6 +512,10 @@
 				3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */,
 				3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */,
 				3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */,
+				3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */,
+				3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */,
+				3C1232351AAE81A400CE8F6C /* srs_protocol_io.cpp */,
+				3C1232361AAE81A400CE8F6C /* srs_protocol_io.hpp */,
 				3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */,
 				3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */,
 				3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */,
@@ -520,12 +524,8 @@
 				3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */,
 				3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
 				3C12322E1AAE81A400CE8F6C /* srs_raw_avc.hpp */,
-				3C12322F1AAE81A400CE8F6C /* srs_protocol_amf0.cpp */,
-				3C1232301AAE81A400CE8F6C /* srs_protocol_amf0.hpp */,
 				3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */,
 				3C1232341AAE81A400CE8F6C /* srs_rtmp_handshake.hpp */,
-				3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */,
-				3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */,
 				3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */,
 				3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */,
 				3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */,
@@ -966,7 +966,7 @@
 				3C1232B51AAE81D900CE8F6C /* srs_app_statistic.cpp in Sources */,
 				3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
 				3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
-				3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
+				3C1232451AAE81A400CE8F6C /* srs_protocol_io.cpp in Sources */,
 				3C1232211AAE814D00CE8F6C /* srs_kernel_stream.cpp in Sources */,
 				3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
 				3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
index 43b11f37e..865164763 100644
--- a/trunk/src/app/srs_app_edge.cpp
+++ b/trunk/src/app/srs_app_edge.cpp
@@ -32,7 +32,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_app_config.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_app_st.hpp>
diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp
index c794e4a32..ff28c149f 100644
--- a/trunk/src/app/srs_app_st.hpp
+++ b/trunk/src/app/srs_app_st.hpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <st.h>
 
 #include <srs_app_st.hpp>
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 
 // the internal classes, user should never use it.
 // user should use the public classes at the bellow:
diff --git a/trunk/src/libs/srs_lib_simple_socket.hpp b/trunk/src/libs/srs_lib_simple_socket.hpp
index c401c7c9f..4cd860d8f 100644
--- a/trunk/src/libs/srs_lib_simple_socket.hpp
+++ b/trunk/src/libs/srs_lib_simple_socket.hpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_librtmp.hpp>
 
 // for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
diff --git a/trunk/src/protocol/srs_rtmp_io.cpp b/trunk/src/protocol/srs_protocol_io.cpp
similarity index 98%
rename from trunk/src/protocol/srs_rtmp_io.cpp
rename to trunk/src/protocol/srs_protocol_io.cpp
index 61add9afc..ac121582a 100644
--- a/trunk/src/protocol/srs_rtmp_io.cpp
+++ b/trunk/src/protocol/srs_protocol_io.cpp
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 
 ISrsBufferReader::ISrsBufferReader()
 {
diff --git a/trunk/src/protocol/srs_rtmp_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp
similarity index 98%
rename from trunk/src/protocol/srs_rtmp_io.hpp
rename to trunk/src/protocol/srs_protocol_io.hpp
index 61b4d95a9..632abcb5b 100644
--- a/trunk/src/protocol/srs_rtmp_io.hpp
+++ b/trunk/src/protocol/srs_protocol_io.hpp
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef SRS_RTMP_PROTOCOL_IO_HPP
-#define SRS_RTMP_PROTOCOL_IO_HPP
+#ifndef SRS_PROTOCOL_IO_HPP
+#define SRS_PROTOCOL_IO_HPP
 
 /*
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 */
 
 #include <srs_core.hpp>
diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp
index ec2e3cf40..4a56b9585 100644
--- a/trunk/src/protocol/srs_protocol_kbps.hpp
+++ b/trunk/src/protocol/srs_protocol_kbps.hpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 
 /**
 * a kbps sample, for example, 1minute kbps, 
diff --git a/trunk/src/protocol/srs_protocol_stream.hpp b/trunk/src/protocol/srs_protocol_stream.hpp
index 7708d0270..1819466f3 100644
--- a/trunk/src/protocol/srs_protocol_stream.hpp
+++ b/trunk/src/protocol/srs_protocol_stream.hpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_core_performance.hpp>
 #include <srs_kernel_stream.hpp>
 
diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp
index 3f05e289f..cfb143c31 100644
--- a/trunk/src/protocol/srs_rtmp_handshake.cpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_kernel_buffer.hpp>
diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp
index 6ecd7fc8c..feee6ac62 100644
--- a/trunk/src/protocol/srs_rtmp_stack.cpp
+++ b/trunk/src/protocol/srs_rtmp_stack.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_rtmp_stack.hpp>
 
 #include <srs_protocol_amf0.hpp>
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/protocol/srs_rtmp_utility.cpp b/trunk/src/protocol/srs_rtmp_utility.cpp
index 44ffdd557..6ebb93c9f 100644
--- a/trunk/src/protocol/srs_rtmp_utility.cpp
+++ b/trunk/src/protocol/srs_rtmp_utility.cpp
@@ -39,7 +39,7 @@ using namespace std;
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_consts.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 
 void srs_discovery_tc_url(
     string tcUrl, 
diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp
index a74a3b198..90c478d36 100644
--- a/trunk/src/protocol/srs_rtsp_stack.cpp
+++ b/trunk/src/protocol/srs_rtsp_stack.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <map>
 using namespace std;
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp
index 24d577586..6832a78fa 100644
--- a/trunk/src/utest/srs_utest_protocol.hpp
+++ b/trunk/src/utest/srs_utest_protocol.hpp
@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace _srs_internal;
 #endif
 
-#include <srs_rtmp_io.hpp>
+#include <srs_protocol_io.hpp>
 
 class MockEmptyIO : public ISrsProtocolReaderWriter
 {