diff --git a/etc/observer.ini b/etc/observer.ini
index 73b9832c0001f5ed5e0928bc4dbac2836f026ad6..f7fb6d38408d1b5bbaa720d124b76aa162d0e211 100644
--- a/etc/observer.ini
+++ b/etc/observer.ini
@@ -57,11 +57,10 @@ count=3
 
 [SessionStage]
 ThreadId=SQLThreads
-NextStages=PlanCacheStage
+NextStages=QueryCacheStage
 
-[PlanCacheStage]
+[QueryCacheStage]
 ThreadId=SQLThreads
-#NextStages=OptimizeStage
 NextStages=ParseStage
 
 [ParseStage]
@@ -70,9 +69,9 @@ NextStages=ResolveStage
 
 [ResolveStage]
 ThreadId=SQLThreads
-NextStages=QueryCacheStage
+NextStages=PlanCacheStage
 
-[QueryCacheStage]
+[PlanCacheStage]
 ThreadId=SQLThreads
 NextStages=OptimizeStage
 
diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp
index c9e5c7c089acc7bc234891d7e7f670f0a3ff6a93..e4b284a1b4526831ffbfdf2a782818cd134a9aa0 100644
--- a/src/observer/session/session_stage.cpp
+++ b/src/observer/session/session_stage.cpp
@@ -35,7 +35,7 @@ using namespace common;
 const std::string SessionStage::SQL_METRIC_TAG = "SessionStage.sql";
 
 // Constructor
-SessionStage::SessionStage(const char *tag) : Stage(tag), plan_cache_stage_(nullptr), sql_metric_(nullptr)
+SessionStage::SessionStage(const char *tag) : Stage(tag), query_cache_stage_(nullptr), sql_metric_(nullptr)
 {}
 
 // Destructor
@@ -74,7 +74,7 @@ bool SessionStage::initialize()
   LOG_TRACE("Enter");
 
   std::list<Stage *>::iterator stgp = next_stage_list_.begin();
-  plan_cache_stage_ = *(stgp++);
+  query_cache_stage_ = *(stgp++);
 
   MetricsRegistry &metricsRegistry = get_metrics_registry();
   sql_metric_ = new SimpleTimer();
@@ -163,5 +163,5 @@ void SessionStage::handle_request(StageEvent *event)
   sev->push_callback(cb);
 
   SQLStageEvent *sql_event = new SQLStageEvent(sev, sql);
-  plan_cache_stage_->handle_event(sql_event);
+  query_cache_stage_->handle_event(sql_event);
 }
diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h
index 206e99e4af4689d45f4c8eba95c8cd6ebe5bffc7..3310af269f637b6647770eb1779dcc7d69a29bb7 100644
--- a/src/observer/session/session_stage.h
+++ b/src/observer/session/session_stage.h
@@ -46,7 +46,7 @@ protected:
   void handle_request(common::StageEvent *event);
 
 private:
-  Stage *plan_cache_stage_ = nullptr;
+  Stage *query_cache_stage_ = nullptr;
   common::SimpleTimer *sql_metric_ = nullptr;
   static const std::string SQL_METRIC_TAG;
 };
diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp
index 92d1868f85969b2327d078f6d1453621545c0cea..89dc86f1948932f17bc280aa45fcc92cf08924a3 100644
--- a/src/observer/sql/parser/resolve_stage.cpp
+++ b/src/observer/sql/parser/resolve_stage.cpp
@@ -69,7 +69,7 @@ bool ResolveStage::initialize()
   LOG_TRACE("Enter");
 
   std::list<Stage *>::iterator stgp = next_stage_list_.begin();
-  query_cache_stage_ = *(stgp++);
+  plan_cache_stage_ = *(stgp++);
 
   LOG_TRACE("Exit");
   return true;
@@ -114,7 +114,7 @@ void ResolveStage::handle_event(StageEvent *event)
 
   sql_event->set_stmt(stmt);
 
-  query_cache_stage_->handle_event(sql_event);
+  plan_cache_stage_->handle_event(sql_event);
 
   LOG_TRACE("Exit\n");
   return;
diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h
index 08897aa41793e01aa0559d7a2a9597a7c0096f81..c2714c0c97dec58df896f05094453d9a526ab79f 100644
--- a/src/observer/sql/parser/resolve_stage.h
+++ b/src/observer/sql/parser/resolve_stage.h
@@ -34,7 +34,7 @@ protected:
 
 protected:
 private:
-  Stage *query_cache_stage_ = nullptr;
+  Stage *plan_cache_stage_ = nullptr;
 };
 
 #endif  //__OBSERVER_SQL_RESOLVE_STAGE_H__
diff --git a/src/observer/sql/plan_cache/plan_cache_stage.cpp b/src/observer/sql/plan_cache/plan_cache_stage.cpp
index 7692bc4556540ea1af6228b0af765bac14da7c5d..bad18bcdc78625efb45afde776b46eec6c64554b 100644
--- a/src/observer/sql/plan_cache/plan_cache_stage.cpp
+++ b/src/observer/sql/plan_cache/plan_cache_stage.cpp
@@ -66,7 +66,7 @@ bool PlanCacheStage::initialize()
 
   std::list<Stage *>::iterator stgp = next_stage_list_.begin();
   //  execute_stage = *(stgp++);
-  parse_stage_ = *(stgp++);
+  optimizer_stage_ = *(stgp++);
 
   LOG_TRACE("Exit");
   return true;
@@ -96,7 +96,7 @@ void PlanCacheStage::handle_event(StageEvent *event)
   event->push_callback(cb);
    */
   // do nothing here, pass the event to the next stage
-  parse_stage_->handle_event(event);
+  optimizer_stage_->handle_event(event);
 
   LOG_TRACE("Exit\n");
   return;
diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h
index 0099f27eeaa4aea06aa2ed7cc1b70c2041abbf90..bf39c02fe0dd4ad8c9c8378fed2c8e5f1f97ca61 100644
--- a/src/observer/sql/plan_cache/plan_cache_stage.h
+++ b/src/observer/sql/plan_cache/plan_cache_stage.h
@@ -34,7 +34,7 @@ protected:
 
 protected:
 private:
-  Stage *parse_stage_ = nullptr;
+  Stage *optimizer_stage_ = nullptr;
 };
 
 #endif  //__OBSERVER_SQL_PLAN_CACHE_STAGE_H__
diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp
index 80b5a60e15027da6d013957da538a89168bd9920..35e812298d1cc532fb84bea932f87ab43505f2cf 100644
--- a/src/observer/sql/query_cache/query_cache_stage.cpp
+++ b/src/observer/sql/query_cache/query_cache_stage.cpp
@@ -65,7 +65,7 @@ bool QueryCacheStage::initialize()
   LOG_TRACE("Enter");
 
   std::list<Stage *>::iterator stgp = next_stage_list_.begin();
-  optimize_stage_ = *(stgp++);
+  parser_stage_ = *(stgp++);
 
   LOG_TRACE("Exit");
   return true;
@@ -83,7 +83,7 @@ void QueryCacheStage::handle_event(StageEvent *event)
 {
   LOG_TRACE("Enter\n");
 
-  optimize_stage_->handle_event(event);
+  parser_stage_->handle_event(event);
 
   LOG_TRACE("Exit\n");
   return;
diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h
index f889d3cc82a3afbe81016c5a8a7b4ba1f3cf0714..2bbcbb57ed03a326b60cfbd6d16f70bf5699c1fc 100644
--- a/src/observer/sql/query_cache/query_cache_stage.h
+++ b/src/observer/sql/query_cache/query_cache_stage.h
@@ -34,7 +34,7 @@ protected:
 
 protected:
 private:
-  Stage *optimize_stage_ = nullptr;
+  Stage *parser_stage_ = nullptr;
 };
 
 #endif  //__OBSERVER_SQL_QUERY_CACHE_STAGE_H__