diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index 366c55337..a9d94f5bb 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -1288,12 +1288,12 @@ int SrsConfig::get_pithy_print_publish()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_PUBLISH_USER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS;
     }
     
     pithy = pithy->get("publish");
     if (!pithy) {
-        return SRS_STAGE_PUBLISH_USER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1303,12 +1303,12 @@ int SrsConfig::get_pithy_print_forwarder()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_FORWARDER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS;
     }
     
     pithy = pithy->get("forwarder");
     if (!pithy) {
-        return SRS_STAGE_FORWARDER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1318,12 +1318,12 @@ int SrsConfig::get_pithy_print_encoder()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_ENCODER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS;
     }
     
     pithy = pithy->get("encoder");
     if (!pithy) {
-        return SRS_STAGE_ENCODER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1333,12 +1333,12 @@ int SrsConfig::get_pithy_print_ingester()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_INGESTER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS;
     }
     
     pithy = pithy->get("ingester");
     if (!pithy) {
-        return SRS_STAGE_INGESTER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1348,12 +1348,12 @@ int SrsConfig::get_pithy_print_hls()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_HLS_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS;
     }
     
     pithy = pithy->get("hls");
     if (!pithy) {
-        return SRS_STAGE_HLS_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1363,12 +1363,12 @@ int SrsConfig::get_pithy_print_play()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_PLAY_USER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS;
     }
     
     pithy = pithy->get("play");
     if (!pithy) {
-        return SRS_STAGE_PLAY_USER_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -1378,12 +1378,12 @@ int SrsConfig::get_pithy_print_edge()
 {
     SrsConfDirective* pithy = root->get("pithy_print");
     if (!pithy) {
-        return SRS_STAGE_EDGE_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS;
     }
     
     pithy = pithy->get("edge");
     if (!pithy) {
-        return SRS_STAGE_EDGE_INTERVAL_MS;
+        return SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS;
     }
     
     return ::atoi(pithy->arg0().c_str());
@@ -2311,13 +2311,13 @@ string SrsConfig::get_ingest_input_type(SrsConfDirective* ingest)
     SrsConfDirective* conf = ingest->get("input");
     
     if (!conf) {
-        return SRS_AUTO_INGEST_TYPE_FILE;
+        return SRS_CONF_DEFAULT_INGEST_TYPE_FILE;
     }
 
     conf = conf->get("type");
     
     if (!conf) {
-        return SRS_AUTO_INGEST_TYPE_FILE;
+        return SRS_CONF_DEFAULT_INGEST_TYPE_FILE;
     }
     
     return conf->arg0();
diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp
index c899e1db6..9a0d32657 100644
--- a/trunk/src/app/srs_app_config.hpp
+++ b/trunk/src/app/srs_app_config.hpp
@@ -77,16 +77,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_INDEX 0
 #define SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES false
 
-#define SRS_STAGE_PLAY_USER_INTERVAL_MS 10000
-#define SRS_STAGE_PUBLISH_USER_INTERVAL_MS 10000
-#define SRS_STAGE_FORWARDER_INTERVAL_MS 10000
-#define SRS_STAGE_ENCODER_INTERVAL_MS 10000
-#define SRS_STAGE_INGESTER_INTERVAL_MS 10000
-#define SRS_STAGE_HLS_INTERVAL_MS 10000
-#define SRS_STAGE_EDGE_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS 10000
+#define SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS 10000
 
-#define SRS_AUTO_INGEST_TYPE_FILE "file"
-#define SRS_AUTO_INGEST_TYPE_STREAM "stream"
+#define SRS_CONF_DEFAULT_INGEST_TYPE_FILE "file"
+#define SRS_CONF_DEFAULT_INGEST_TYPE_STREAM "stream"
 
 #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv"
 #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv"
diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp
index 7b58f637d..085964d05 100644
--- a/trunk/src/app/srs_app_ingest.cpp
+++ b/trunk/src/app/srs_app_ingest.cpp
@@ -284,7 +284,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
         return ret;
     }
 
-    if (input_type == SRS_AUTO_INGEST_TYPE_FILE) {
+    if (input_type == SRS_CONF_DEFAULT_INGEST_TYPE_FILE) {
         std::string input_url = _srs_config->get_ingest_input_url(ingest);
         if (input_url.empty()) {
             ret = ERROR_ENCODER_NO_INPUT;
@@ -298,7 +298,7 @@ int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, S
         if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) {
             return ret;
         }
-    } else if (input_type == SRS_AUTO_INGEST_TYPE_STREAM) {
+    } else if (input_type == SRS_CONF_DEFAULT_INGEST_TYPE_STREAM) {
         std::string input_url = _srs_config->get_ingest_input_url(ingest);
         if (input_url.empty()) {
             ret = ERROR_ENCODER_NO_INPUT;
diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp
index 28f66af5d..d0822e8b0 100644
--- a/trunk/src/utest/srs_utest_config.cpp
+++ b/trunk/src/utest/srs_utest_config.cpp
@@ -109,31 +109,31 @@ VOID TEST(ConfigTest, CheckMacros)
 #ifndef SRS_CONF_DEFAULT_HTTP_HEAETBEAT_SUMMARIES
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_PLAY_USER_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_PLAY_USER_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_PUBLISH_USER_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_PUBLISH_USER_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_FORWARDER_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_FORWARDER_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_ENCODER_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_ENCODER_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_INGESTER_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_INGESTER_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_HLS_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_HLS_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_STAGE_EDGE_INTERVAL_MS
+#ifndef SRS_CONF_DEFAULT_STAGE_EDGE_INTERVAL_MS
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_AUTO_INGEST_TYPE_FILE
+#ifndef SRS_CONF_DEFAULT_INGEST_TYPE_FILE
     EXPECT_TRUE(false);
 #endif
-#ifndef SRS_AUTO_INGEST_TYPE_STREAM
+#ifndef SRS_CONF_DEFAULT_INGEST_TYPE_STREAM
     EXPECT_TRUE(false);
 #endif
 #ifndef SRS_CONF_DEFAULT_TRANSCODE_IFORMAT