diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index 99b5975847b..9c33b38ce05 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -50,7 +50,7 @@
 #include <grpc++/support/status.h>
 #include <grpc/compression.h>
 
-#include "src/cpp/rpcmanager/grpc_rpc_manager.h"
+#include "src/cpp/thread_manager/thread_manager.h"
 
 struct grpc_server;
 
diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc
index 93ccfb4d988..e2b32512f19 100644
--- a/src/cpp/thread_manager/thread_manager.cc
+++ b/src/cpp/thread_manager/thread_manager.cc
@@ -36,7 +36,7 @@
 #include <grpc/support/log.h>
 #include <climits>
 
-#include "src/cpp/rpcmanager/grpc_rpc_manager.h"
+#include "src/cpp/thread_manager/thread_manager.h"
 
 namespace grpc {
 
diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc
index 07fabd6bc36..990e2bab3f7 100644
--- a/test/cpp/thread_manager/thread_manager_test.cc
+++ b/test/cpp/thread_manager/thread_manager_test.cc
@@ -39,7 +39,7 @@
 #include <grpc++/grpc++.h>
 #include <grpc/support/log.h>
 
-#include "test/cpp/rpcmanager/grpc_rpc_manager_test.h"
+#include "test/cpp/thread_manager/thread_manager_test.h"
 #include "test/cpp/util/test_config.h"
 
 using grpc::testing::ThreadManagerTest;
diff --git a/test/cpp/thread_manager/thread_manager_test.h b/test/cpp/thread_manager/thread_manager_test.h
index 01bf52459f7..176448243b7 100644
--- a/test/cpp/thread_manager/thread_manager_test.h
+++ b/test/cpp/thread_manager/thread_manager_test.h
@@ -33,7 +33,7 @@
 #ifndef GRPC_TEST_CPP_THREAD_MANAGER_TEST_H
 #define GRPC_TEST_CPP_THREAD_MANAGER_TEST_H
 
-#include "src/cpp/rpcmanager/grpc_rpc_manager.h"
+#include "src/cpp/thread_manager/thread_manager.h"
 
 namespace grpc {
 namespace testing {