Index: clangd/CMakeLists.txt
===================================================================
--- clangd/CMakeLists.txt
+++ clangd/CMakeLists.txt
@@ -73,7 +73,7 @@
   add_subdirectory(fuzzer)
 endif()
 add_subdirectory(tool)
-add_subdirectory(global-symbol-builder)
+add_subdirectory(symbol-builder)
 add_subdirectory(index/dex/dexp)
 
 if (LLVM_INCLUDE_BENCHMARKS)
Index: clangd/symbol-builder/CMakeLists.txt
===================================================================
--- clangd/symbol-builder/CMakeLists.txt
+++ clangd/symbol-builder/CMakeLists.txt
@@ -4,11 +4,11 @@
     Support
     )
 
-add_clang_executable(global-symbol-builder
-  GlobalSymbolBuilderMain.cpp
+add_clang_executable(clangd-symbol-builder
+  SymbolBuilderMain.cpp
   )
 
-target_link_libraries(global-symbol-builder
+target_link_libraries(clangd-symbol-builder
   PRIVATE
   clangAST
   clangIndex
Index: clangd/symbol-builder/SymbolBuilderMain.cpp
===================================================================
--- clangd/symbol-builder/SymbolBuilderMain.cpp
+++ clangd/symbol-builder/SymbolBuilderMain.cpp
@@ -225,11 +225,11 @@
   Example usage for building index for the whole project using CMake compile
   commands:
 
-  $ global-symbol-builder --executor=all-TUs compile_commands.json > index.yaml
+  $ clangd-symbol-builder --executor=all-TUs compile_commands.json > index.yaml
 
   Example usage for file sequence index without flags:
 
-  $ global-symbol-builder File1.cpp File2.cpp ... FileN.cpp > index.yaml
+  $ clangd-symbol-builder File1.cpp File2.cpp ... FileN.cpp > index.yaml
 
   Note: only symbols from header files will be collected.
   )";
Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -55,7 +55,7 @@
 
   # These individual tools have no tests, add them here to make them compile
   # together with check-clang-tools, so that we won't break them in the future.
-  global-symbol-builder
+  clangd-symbol-builder
 
   # Unit tests
   ExtraToolsUnitTests
Index: test/clangd/index-tools.test
===================================================================
--- test/clangd/index-tools.test
+++ test/clangd/index-tools.test
@@ -1,3 +1,3 @@
-# RUN: global-symbol-builder %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
+# RUN: clangd-symbol-builder %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
 # FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command.
 # RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.log --benchmark_min_time=0.01 ; fi