diff --git a/trunk/configure b/trunk/configure
index da3f60092..f34c47e30 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -213,7 +213,7 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_buffer"
         "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
         "srs_kernel_stream" "srs_kernel_balance" "srs_kernel_mp4" "srs_kernel_file")
 if [[ $SRS_RTC == YES ]]; then
-    MODULE_FILES+=("srs_kernel_rtp")
+    MODULE_FILES+=("srs_kernel_rtc_rtp")
 fi
 KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
 KERNEL_OBJS="${MODULE_OBJS[@]}"
@@ -227,7 +227,7 @@ MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
         "srs_raw_avc" "srs_rtsp_stack" "srs_sip_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
         "srs_protocol_format")
 if [[ $SRS_RTC == YES ]]; then
-    MODULE_FILES+=("srs_stun_stack")
+    MODULE_FILES+=("srs_rtc_stun_stack")
 fi
 PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh
 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
@@ -279,8 +279,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
             "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
             "srs_app_coworkers" "srs_app_hybrid")
     if [[ $SRS_RTC == YES ]]; then
-        MODULE_FILES+=("srs_app_rtc" "srs_app_rtc_conn" "srs_app_dtls" "srs_app_audio_recode" "srs_app_sdp"
-            "srs_app_rtp_queue" "srs_app_rtc_server")
+        MODULE_FILES+=("srs_app_rtc" "srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_codec" "srs_app_rtc_sdp"
+            "srs_app_rtc_queue" "srs_app_rtc_server")
     fi
     if [[ $SRS_GB28181 == YES ]]; then
         MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip")
diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp
index 5b240539a..2e05100b8 100644
--- a/trunk/src/app/srs_app_rtc.cpp
+++ b/trunk/src/app/srs_app_rtc.cpp
@@ -38,7 +38,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
@@ -51,7 +51,7 @@ using namespace std;
 #include <srs_protocol_format.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <openssl/rand.h>
-#include <srs_app_audio_recode.hpp>
+#include <srs_app_rtc_codec.hpp>
 
 // TODO: Add this function into SrsRtpMux class.
 srs_error_t aac_raw_append_adts_header(SrsSharedPtrMessage* shared_audio, SrsFormat* format, char** pbuf, int* pnn_buf)
diff --git a/trunk/src/app/srs_app_audio_recode.cpp b/trunk/src/app/srs_app_rtc_codec.cpp
similarity index 99%
rename from trunk/src/app/srs_app_audio_recode.cpp
rename to trunk/src/app/srs_app_rtc_codec.cpp
index 6e60c2e96..c703b425a 100644
--- a/trunk/src/app/srs_app_audio_recode.cpp
+++ b/trunk/src/app/srs_app_rtc_codec.cpp
@@ -24,7 +24,7 @@
 
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_app_audio_recode.hpp>
+#include <srs_app_rtc_codec.hpp>
 
 static const int kOpusPacketMs  = 20;
 static const int kOpusMaxbytes  = 8000;
diff --git a/trunk/src/app/srs_app_audio_recode.hpp b/trunk/src/app/srs_app_rtc_codec.hpp
similarity index 98%
rename from trunk/src/app/srs_app_audio_recode.hpp
rename to trunk/src/app/srs_app_rtc_codec.hpp
index d37afc381..d236a2304 100644
--- a/trunk/src/app/srs_app_audio_recode.hpp
+++ b/trunk/src/app/srs_app_rtc_codec.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_APP_AUDIO_RECODE_HPP
-#define SRS_APP_AUDIO_RECODE_HPP
+#ifndef SRS_APP_RTC_CODEC_HPP
+#define SRS_APP_RTC_CODEC_HPP
 
 #include <srs_core.hpp>
 
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index e222bacbc..b4352f236 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -44,17 +44,17 @@ using namespace std;
 
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_buffer.hpp>
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_stun_stack.hpp>
+#include <srs_rtc_stun_stack.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_msg_array.hpp>
-#include <srs_app_dtls.hpp>
+#include <srs_app_rtc_dtls.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_rtc.hpp>
-#include <srs_app_rtp_queue.hpp>
+#include <srs_app_rtc_queue.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
 #include <srs_service_utility.hpp>
diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp
index b98813422..b47dc3091 100644
--- a/trunk/src/app/srs_app_rtc_conn.hpp
+++ b/trunk/src/app/srs_app_rtc_conn.hpp
@@ -31,10 +31,10 @@
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_hybrid.hpp>
 #include <srs_app_hourglass.hpp>
-#include <srs_app_sdp.hpp>
+#include <srs_app_rtc_sdp.hpp>
 #include <srs_app_reload.hpp>
-#include <srs_kernel_rtp.hpp>
-#include <srs_app_rtp_queue.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
+#include <srs_app_rtc_queue.hpp>
 
 #include <string>
 #include <map>
diff --git a/trunk/src/app/srs_app_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp
similarity index 99%
rename from trunk/src/app/srs_app_dtls.cpp
rename to trunk/src/app/srs_app_rtc_dtls.cpp
index 0b8767851..68419af8c 100644
--- a/trunk/src/app/srs_app_dtls.cpp
+++ b/trunk/src/app/srs_app_rtc_dtls.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_app_dtls.hpp>
+#include <srs_app_rtc_dtls.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/app/srs_app_dtls.hpp b/trunk/src/app/srs_app_rtc_dtls.hpp
similarity index 96%
rename from trunk/src/app/srs_app_dtls.hpp
rename to trunk/src/app/srs_app_rtc_dtls.hpp
index 25cc80b4c..892aa945b 100644
--- a/trunk/src/app/srs_app_dtls.hpp
+++ b/trunk/src/app/srs_app_rtc_dtls.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_APP_DTLS_HPP
-#define SRS_APP_DTLS_HPP
+#ifndef SRS_APP_RTC_DTLS_HPP
+#define SRS_APP_RTC_DTLS_HPP
 
 #include <srs_core.hpp>
 
diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtc_queue.cpp
similarity index 99%
rename from trunk/src/app/srs_app_rtp_queue.cpp
rename to trunk/src/app/srs_app_rtc_queue.cpp
index 700eabc92..65da0f5ff 100644
--- a/trunk/src/app/srs_app_rtp_queue.cpp
+++ b/trunk/src/app/srs_app_rtc_queue.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_app_rtp_queue.hpp>
+#include <srs_app_rtc_queue.hpp>
 
 #include <string.h>
 #include <unistd.h>
@@ -30,7 +30,7 @@
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
 
diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtc_queue.hpp
similarity index 99%
rename from trunk/src/app/srs_app_rtp_queue.hpp
rename to trunk/src/app/srs_app_rtc_queue.hpp
index 85f9a7f79..b71af99f6 100644
--- a/trunk/src/app/srs_app_rtp_queue.hpp
+++ b/trunk/src/app/srs_app_rtc_queue.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_APP_RTP_QUEUE_HPP
-#define SRS_APP_RTP_QUEUE_HPP
+#ifndef SRS_APP_RTC_QUEUE_HPP
+#define SRS_APP_RTC_QUEUE_HPP
 
 #include <srs_core.hpp>
 
diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_rtc_sdp.cpp
similarity index 99%
rename from trunk/src/app/srs_app_sdp.cpp
rename to trunk/src/app/srs_app_rtc_sdp.cpp
index c744e229c..4cbd50715 100644
--- a/trunk/src/app/srs_app_sdp.cpp
+++ b/trunk/src/app/srs_app_rtc_sdp.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_app_sdp.hpp>
+#include <srs_app_rtc_sdp.hpp>
 using namespace std;
 
 #include <stdlib.h>
diff --git a/trunk/src/app/srs_app_sdp.hpp b/trunk/src/app/srs_app_rtc_sdp.hpp
similarity index 99%
rename from trunk/src/app/srs_app_sdp.hpp
rename to trunk/src/app/srs_app_rtc_sdp.hpp
index c0fb95321..b6f9a9a20 100644
--- a/trunk/src/app/srs_app_sdp.hpp
+++ b/trunk/src/app/srs_app_rtc_sdp.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_APP_SDP_HPP
-#define SRS_APP_SDP_HPP
+#ifndef SRS_APP_RTC_SDP_HPP
+#define SRS_APP_RTC_SDP_HPP
 
 #include <srs_core.hpp>
 #include <srs_kernel_utility.hpp>
diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp
index 4ce0d15ad..f4d3dcd5a 100644
--- a/trunk/src/app/srs_app_rtc_server.cpp
+++ b/trunk/src/app/srs_app_rtc_server.cpp
@@ -32,11 +32,11 @@
 #include <srs_app_pithy_print.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_rtc_conn.hpp>
-#include <srs_stun_stack.hpp>
+#include <srs_rtc_stun_stack.hpp>
 #include <srs_http_stack.hpp>
 #include <srs_app_server.hpp>
 #include <srs_app_http_api.hpp>
-#include <srs_app_dtls.hpp>
+#include <srs_app_rtc_dtls.hpp>
 #include <srs_service_utility.hpp>
 
 using namespace std;
diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index d84d1d51d..d881ef140 100755
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -31,7 +31,7 @@ using namespace std;
 #include <srs_rtmp_stack.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_kernel_codec.hpp>
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 #include <srs_app_hls.hpp>
 #include <srs_app_forward.hpp>
 #include <srs_app_config.hpp>
diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp
index 26a3ffdde..e104790e0 100644
--- a/trunk/src/kernel/srs_kernel_codec.cpp
+++ b/trunk/src/kernel/srs_kernel_codec.cpp
@@ -32,7 +32,7 @@ using namespace std;
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 
 string srs_video_codec_id2str(SrsVideoCodecId codec)
 {
diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp
index f10bb608a..ff8be065c 100644
--- a/trunk/src/kernel/srs_kernel_flv.cpp
+++ b/trunk/src/kernel/srs_kernel_flv.cpp
@@ -41,7 +41,7 @@ using namespace std;
 #include <srs_core_mem_watch.hpp>
 #include <srs_core_autofree.hpp>
 #ifdef SRS_RTC
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 #endif
 
 SrsMessageHeader::SrsMessageHeader()
diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp
similarity index 99%
rename from trunk/src/kernel/srs_kernel_rtp.cpp
rename to trunk/src/kernel/srs_kernel_rtc_rtp.cpp
index 7d59e4e2d..c880b6fc0 100644
--- a/trunk/src/kernel/srs_kernel_rtp.cpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_kernel_rtp.hpp>
+#include <srs_kernel_rtc_rtp.hpp>
 
 #include <fcntl.h>
 #include <sstream>
diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp
similarity index 99%
rename from trunk/src/kernel/srs_kernel_rtp.hpp
rename to trunk/src/kernel/srs_kernel_rtc_rtp.hpp
index 9651edd55..77a7fb5b3 100644
--- a/trunk/src/kernel/srs_kernel_rtp.hpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_KERNEL_RTP_HPP
-#define SRS_KERNEL_RTP_HPP
+#ifndef SRS_KERNEL_RTC_RTP_HPP
+#define SRS_KERNEL_RTC_RTP_HPP
 
 #include <srs_core.hpp>
 
diff --git a/trunk/src/protocol/srs_stun_stack.cpp b/trunk/src/protocol/srs_rtc_stun_stack.cpp
similarity index 99%
rename from trunk/src/protocol/srs_stun_stack.cpp
rename to trunk/src/protocol/srs_rtc_stun_stack.cpp
index cabc681ff..f35b4f942 100644
--- a/trunk/src/protocol/srs_stun_stack.cpp
+++ b/trunk/src/protocol/srs_rtc_stun_stack.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_stun_stack.hpp>
+#include <srs_rtc_stun_stack.hpp>
 
 using namespace std;
 
diff --git a/trunk/src/protocol/srs_stun_stack.hpp b/trunk/src/protocol/srs_rtc_stun_stack.hpp
similarity index 98%
rename from trunk/src/protocol/srs_stun_stack.hpp
rename to trunk/src/protocol/srs_rtc_stun_stack.hpp
index 1f2571138..682a6c84d 100644
--- a/trunk/src/protocol/srs_stun_stack.hpp
+++ b/trunk/src/protocol/srs_rtc_stun_stack.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_PROTOCOL_STUN_HPP
-#define SRS_PROTOCOL_STUN_HPP
+#ifndef SRS_PROTOCOL_RTC_STUN_HPP
+#define SRS_PROTOCOL_RTC_STUN_HPP
 
 #include <srs_core.hpp>