diff --git a/trunk/configure b/trunk/configure
index 32a36a313..f6a0635da 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -149,7 +149,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR})
 MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
         "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" 
         "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
-        "srs_kernel_buffer")
+        "srs_kernel_temp")
 KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
 KERNEL_OBJS="${MODULE_OBJS[@]}"
 #
diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp
index a75ad1692..3473ab5c4 100755
--- a/trunk/ide/srs_upp/srs_upp.upp
+++ b/trunk/ide/srs_upp/srs_upp.upp
@@ -23,8 +23,8 @@ file
     kernel readonly separator,
     ../../src/kernel/srs_kernel_aac.hpp,
     ../../src/kernel/srs_kernel_aac.cpp,
-    ../../src/kernel/srs_kernel_buffer.hpp,
-    ../../src/kernel/srs_kernel_buffer.cpp,
+    ../../src/kernel/srs_kernel_temp.hpp,
+    ../../src/kernel/srs_kernel_temp.cpp,
     ../../src/kernel/srs_kernel_codec.hpp,
     ../../src/kernel/srs_kernel_codec.cpp,
     ../../src/kernel/srs_kernel_consts.hpp,
diff --git a/trunk/ide/srs_vs2010/srs.vcxproj b/trunk/ide/srs_vs2010/srs.vcxproj
index 0959cdcc2..44b68a9ce 100755
--- a/trunk/ide/srs_vs2010/srs.vcxproj
+++ b/trunk/ide/srs_vs2010/srs.vcxproj
@@ -105,7 +105,7 @@
     <ClInclude Include="..\..\src\core\srs_core_performance.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" />
-    <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp" />
+    <ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" />
     <ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" />
@@ -187,7 +187,7 @@
     <ClCompile Include="..\..\src\core\srs_core_performance.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" />
-    <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp" />
+    <ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" />
     <ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" />
diff --git a/trunk/ide/srs_vs2010/srs.vcxproj.filters b/trunk/ide/srs_vs2010/srs.vcxproj.filters
index 02de8979f..346e7a0ff 100755
--- a/trunk/ide/srs_vs2010/srs.vcxproj.filters
+++ b/trunk/ide/srs_vs2010/srs.vcxproj.filters
@@ -199,7 +199,7 @@
     <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp">
       <Filter>srs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp">
+    <ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp">
       <Filter>srs</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp">
@@ -393,7 +393,7 @@
     <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp">
       <Filter>srs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp">
+    <ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp">
       <Filter>srs</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp">
diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
index bfaaeaa48..045cc2f69 100644
--- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
+++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
@@ -18,7 +18,7 @@
 		3C1231F81AAE652D00CE8F6C /* srs_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F41AAE652D00CE8F6C /* srs_core.cpp */; };
 		3C1232061AAE812C00CE8F6C /* srs_main_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */; };
 		3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; };
-		3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */; };
+		3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */; };
 		3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */; };
 		3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */; };
 		3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232101AAE814D00CE8F6C /* srs_kernel_error.cpp */; };
@@ -149,8 +149,8 @@
 		3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_main_server.cpp; path = ../../../src/main/srs_main_server.cpp; sourceTree = "<group>"; };
 		3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_aac.cpp; path = ../../../src/kernel/srs_kernel_aac.cpp; sourceTree = "<group>"; };
 		3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_aac.hpp; path = ../../../src/kernel/srs_kernel_aac.hpp; sourceTree = "<group>"; };
-		3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_buffer.cpp; path = ../../../src/kernel/srs_kernel_buffer.cpp; sourceTree = "<group>"; };
-		3C12320B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_buffer.hpp; path = ../../../src/kernel/srs_kernel_buffer.hpp; sourceTree = "<group>"; };
+		3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_temp.cpp; path = ../../../src/kernel/srs_kernel_temp.cpp; sourceTree = "<group>"; };
+		3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_temp.hpp; path = ../../../src/kernel/srs_kernel_temp.hpp; sourceTree = "<group>"; };
 		3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_codec.cpp; path = ../../../src/kernel/srs_kernel_codec.cpp; sourceTree = "<group>"; };
 		3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_codec.hpp; path = ../../../src/kernel/srs_kernel_codec.hpp; sourceTree = "<group>"; };
 		3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_consts.cpp; path = ../../../src/kernel/srs_kernel_consts.cpp; sourceTree = "<group>"; };
@@ -479,8 +479,8 @@
 			children = (
 				3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */,
 				3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */,
-				3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */,
-				3C12320B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */,
+				3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */,
+				3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */,
 				3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */,
 				3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */,
 				3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */,
@@ -967,7 +967,7 @@
 				3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */,
 				3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
 				3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
-				3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
+				3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */,
 				3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
 				3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
 				3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */,
diff --git a/trunk/scripts/sources_replace.sh b/trunk/scripts/sources_replace.sh
index 5b7667856..2c68b11b9 100755
--- a/trunk/scripts/sources_replace.sh
+++ b/trunk/scripts/sources_replace.sh
@@ -21,6 +21,6 @@ for file in $files; do
     grep -in "$from" $file >/dev/null 2>&1; 
     if [[ 0 -eq $? ]]; then 
         echo "replace $file"; 
-        #sed -i '' "s|$from|$to|g" $file; 
+        sed -i '' "s|$from|$to|g" $file; 
     fi; 
 done
diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp
index c9d5f342b..4cf6ce06f 100644
--- a/trunk/src/app/srs_app_mpegts_udp.cpp
+++ b/trunk/src/app/srs_app_mpegts_udp.cpp
@@ -38,7 +38,7 @@ using namespace std;
 #include <srs_kernel_ts.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_ts.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_rtsp.cpp b/trunk/src/app/srs_app_rtsp.cpp
index f480b8309..2c0d29480 100644
--- a/trunk/src/app/srs_app_rtsp.cpp
+++ b/trunk/src/app/srs_app_rtsp.cpp
@@ -34,7 +34,7 @@ using namespace std;
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_stream.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_rtmp_utility.hpp>
diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp
index 83f312396..1cf0b4b9e 100644
--- a/trunk/src/kernel/srs_kernel_buffer.cpp
+++ b/trunk/src/kernel/srs_kernel_buffer.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_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp
index 3997b8064..9a403235e 100644
--- a/trunk/src/kernel/srs_kernel_buffer.hpp
+++ b/trunk/src/kernel/srs_kernel_buffer.hpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SRS_KERNEL_BUFFER_HPP
 
 /*
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 */
 
 #include <srs_core.hpp>
diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp
index fb560e675..ae906ec0c 100644
--- a/trunk/src/kernel/srs_kernel_ts.cpp
+++ b/trunk/src/kernel/srs_kernel_ts.cpp
@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
index 5f7771140..6d0eb58c0 100644
--- a/trunk/src/main/srs_main_ingest_hls.cpp
+++ b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_app_log.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_ts.hpp>
 #include <srs_app_http_client.hpp>
diff --git a/trunk/src/protocol/srs_protocol_buffer.hpp b/trunk/src/protocol/srs_protocol_buffer.hpp
index d55570bb4..d77862739 100644
--- a/trunk/src/protocol/srs_protocol_buffer.hpp
+++ b/trunk/src/protocol/srs_protocol_buffer.hpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_rtmp_io.hpp>
 #include <srs_core_performance.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 
 #ifdef SRS_PERF_MERGED_READ
 /**
diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp
index 1bc90ac93..ad157b02e 100644
--- a/trunk/src/protocol/srs_rtsp_stack.cpp
+++ b/trunk/src/protocol/srs_rtsp_stack.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_rtmp_io.hpp>
-#include <srs_kernel_buffer.hpp>
+#include <srs_kernel_temp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_consts.hpp>