diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index a2fb205e93..fecd87b302 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -23,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-574 - Milvus configuration refactor
 - MS-578 - Make sure milvus5.0 don't crack 0.3.1 data
 - MS-585 - Update namespace in scheduler
+- MS-608 - Update TODO names
 
 ## New Feature
 
diff --git a/cpp/src/scheduler/ResourceMgr.cpp b/cpp/src/scheduler/ResourceMgr.cpp
index 9906c71bbe..a4f73f9a34 100644
--- a/cpp/src/scheduler/ResourceMgr.cpp
+++ b/cpp/src/scheduler/ResourceMgr.cpp
@@ -74,7 +74,7 @@ ResourceMgr::Connect(const std::string& name1, const std::string& name2, Connect
     auto res2 = GetResource(name2);
     if (res1 && res2) {
         res1->AddNeighbour(std::static_pointer_cast<Node>(res2), connection);
-        // TODO(wxy): enable when task balance supported
+        // TODO(wxyu): enable when task balance supported
         //        res2->AddNeighbour(std::static_pointer_cast<Node>(res1), connection);
         return true;
     }
diff --git a/cpp/src/scheduler/ResourceMgr.h b/cpp/src/scheduler/ResourceMgr.h
index a81e6c239f..82ba0e6449 100644
--- a/cpp/src/scheduler/ResourceMgr.h
+++ b/cpp/src/scheduler/ResourceMgr.h
@@ -64,7 +64,7 @@ class ResourceMgr {
         return disk_resources_;
     }
 
-    // TODO(wxy): why return shared pointer
+    // TODO(wxyu): why return shared pointer
     inline std::vector<ResourcePtr>
     GetAllResources() {
         return resources_;
@@ -89,7 +89,7 @@ class ResourceMgr {
     GetNumGpuResource() const;
 
  public:
-    // TODO(wxy): add stats interface(low)
+    // TODO(wxyu): add stats interface(low)
 
  public:
     /******** Utility Functions ********/
diff --git a/cpp/src/scheduler/SchedInst.cpp b/cpp/src/scheduler/SchedInst.cpp
index f17aceb596..b9edbca001 100644
--- a/cpp/src/scheduler/SchedInst.cpp
+++ b/cpp/src/scheduler/SchedInst.cpp
@@ -146,7 +146,7 @@ load_advance_config() {
     //        }
     //    } catch (const char *msg) {
     //        SERVER_LOG_ERROR << msg;
-    //        // TODO(wxy): throw exception instead
+    //        // TODO(wxyu): throw exception instead
     //        exit(-1);
     ////        throw std::exception();
     //    }
diff --git a/cpp/src/scheduler/Scheduler.cpp b/cpp/src/scheduler/Scheduler.cpp
index 6963ed3c5f..3a82a1b361 100644
--- a/cpp/src/scheduler/Scheduler.cpp
+++ b/cpp/src/scheduler/Scheduler.cpp
@@ -92,7 +92,7 @@ Scheduler::Process(const EventPtr& event) {
     process_event(event);
 }
 
-// TODO(wxy): refactor the function
+// TODO(wxyu): refactor the function
 void
 Scheduler::OnLoadCompleted(const EventPtr& event) {
     auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);
diff --git a/cpp/src/scheduler/Scheduler.h b/cpp/src/scheduler/Scheduler.h
index 1d8af9f4d4..5b222cc41a 100644
--- a/cpp/src/scheduler/Scheduler.h
+++ b/cpp/src/scheduler/Scheduler.h
@@ -31,7 +31,7 @@
 namespace milvus {
 namespace scheduler {
 
-// TODO(wxy): refactor, not friendly to unittest, logical in framework code
+// TODO(wxyu): refactor, not friendly to unittest, logical in framework code
 class Scheduler {
  public:
     explicit Scheduler(ResourceMgrWPtr res_mgr);
diff --git a/cpp/src/scheduler/TaskCreator.cpp b/cpp/src/scheduler/TaskCreator.cpp
index a82328a9bf..d503a5757c 100644
--- a/cpp/src/scheduler/TaskCreator.cpp
+++ b/cpp/src/scheduler/TaskCreator.cpp
@@ -32,7 +32,7 @@ TaskCreator::Create(const JobPtr& job) {
             return Create(std::static_pointer_cast<DeleteJob>(job));
         }
         default: {
-            // TODO(wxy): error
+            // TODO(wxyu): error
             return std::vector<TaskPtr>();
         }
     }
diff --git a/cpp/src/scheduler/TaskTable.h b/cpp/src/scheduler/TaskTable.h
index 35becbe5f8..ad81b5d439 100644
--- a/cpp/src/scheduler/TaskTable.h
+++ b/cpp/src/scheduler/TaskTable.h
@@ -125,7 +125,7 @@ class TaskTable {
     Get(uint64_t index);
 
     /*
-     * TODO(wxy): BIG GC
+     * TODO(wxyu): BIG GC
      * Remove sequence task which is DONE or MOVED from front;
      * Called by ?
      */
@@ -173,7 +173,7 @@ class TaskTable {
  public:
     /******** Action ********/
 
-    // TODO(wxy): bool to Status
+    // TODO(wxyu): bool to Status
     /*
      * Load a task;
      * Set state loading;
diff --git a/cpp/src/scheduler/action/PushTaskToNeighbour.cpp b/cpp/src/scheduler/action/PushTaskToNeighbour.cpp
index 22b82864b6..2f5042cb73 100644
--- a/cpp/src/scheduler/action/PushTaskToNeighbour.cpp
+++ b/cpp/src/scheduler/action/PushTaskToNeighbour.cpp
@@ -82,7 +82,7 @@ Action::PushTaskToNeighbourRandomly(const TaskPtr& task, const ResourcePtr& self
         }
 
     } else {
-        // TODO(wxy): process
+        // TODO(wxyu): process
     }
 }
 
diff --git a/cpp/src/scheduler/resource/Resource.h b/cpp/src/scheduler/resource/Resource.h
index e8b50fe9af..c9026f13b6 100644
--- a/cpp/src/scheduler/resource/Resource.h
+++ b/cpp/src/scheduler/resource/Resource.h
@@ -38,7 +38,7 @@
 namespace milvus {
 namespace scheduler {
 
-// TODO(wxy): Storage, Route, Executor
+// TODO(wxyu): Storage, Route, Executor
 enum class ResourceType {
     DISK = 0,
     CPU = 1,
@@ -114,11 +114,11 @@ class Resource : public Node, public std::enable_shared_from_this<Resource> {
         return enable_executor_;
     }
 
-    // TODO(wxy): const
+    // TODO(wxyu): const
     uint64_t
     NumOfTaskToExec();
 
-    // TODO(wxy): need double ?
+    // TODO(wxyu): need double ?
     inline uint64_t
     TaskAvgCost() const {
         return total_cost_ / total_task_;
diff --git a/cpp/src/scheduler/task/SearchTask.h b/cpp/src/scheduler/task/SearchTask.h
index 3143799715..17104734ae 100644
--- a/cpp/src/scheduler/task/SearchTask.h
+++ b/cpp/src/scheduler/task/SearchTask.h
@@ -26,7 +26,7 @@
 namespace milvus {
 namespace scheduler {
 
-// TODO(wxy): rewrite
+// TODO(wxyu): rewrite
 class XSearchTask : public Task {
  public:
     explicit XSearchTask(TableFileSchemaPtr file);