diff --git a/cpp/src/db/scheduler/IndexLoaderQueue.cpp b/cpp/src/db/scheduler/IndexLoaderQueue.cpp
index 7f748a65a9..2840e6564e 100644
--- a/cpp/src/db/scheduler/IndexLoaderQueue.cpp
+++ b/cpp/src/db/scheduler/IndexLoaderQueue.cpp
@@ -15,8 +15,8 @@ namespace engine {
 
 IndexLoaderQueue&
 IndexLoaderQueue::GetInstance() {
-    static IndexLoaderQueue s_instance;
-    return s_instance;
+    static IndexLoaderQueue instance;
+    return instance;
 }
 
 void
diff --git a/cpp/src/db/scheduler/SearchTaskQueue.inl b/cpp/src/db/scheduler/SearchTaskQueue.inl
index c9cbaf8a1b..7816ba8878 100644
--- a/cpp/src/db/scheduler/SearchTaskQueue.inl
+++ b/cpp/src/db/scheduler/SearchTaskQueue.inl
@@ -66,8 +66,8 @@ SearchTaskQueue::SearchTaskQueue() {
 
 SearchTaskQueue&
 SearchTaskQueue::GetInstance() {
-    static SearchTaskQueue s_instance;
-    return s_instance;
+    static SearchTaskQueue instance;
+    return instance;
 }
 
 template<typename trait>