diff --git a/clang/test/Analysis/Scalable/ssaf-format/list.test b/clang/test/Analysis/Scalable/ssaf-format/list.test
index b4bedcd99f2bc..47a678766aed1 100644
--- a/clang/test/Analysis/Scalable/ssaf-format/list.test
+++ b/clang/test/Analysis/Scalable/ssaf-format/list.test
@@ -1,6 +1,6 @@
-// Test ssaf-format --list output without any loaded plugins.
+// Test clang-ssaf-format --list output without any loaded plugins.
 
-// RUN: ssaf-format --list \
+// RUN: clang-ssaf-format --list \
 // RUN:   | FileCheck %s
 
 // CHECK: Registered serialization formats:
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index b326ba12d7d21..f6244c938fc90 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -103,11 +103,11 @@ list(APPEND CLANG_TEST_DEPS
   clang-linker-wrapper
   clang-nvlink-wrapper
   clang-offload-bundler
+  clang-ssaf-format
   clang-ssaf-linker
   clang-sycl-linker
   diagtool
   hmaptool
-  ssaf-format
   )
 
 if(CLANG_ENABLE_CIR)
diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
index e9ede820c5756..183b674dcddae 100644
--- a/clang/test/lit.cfg.py
+++ b/clang/test/lit.cfg.py
@@ -143,7 +143,7 @@
         unresolved="ignore",
     ),
     "clang-ssaf-linker",
-    "ssaf-format",
+    "clang-ssaf-format",
 ]
 
 if config.clang_examples:
diff --git a/clang/tools/ssaf-format/CMakeLists.txt b/clang/tools/ssaf-format/CMakeLists.txt
index e517c5af920ec..170d84af56cd4 100644
--- a/clang/tools/ssaf-format/CMakeLists.txt
+++ b/clang/tools/ssaf-format/CMakeLists.txt
@@ -3,11 +3,11 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
-add_clang_tool(ssaf-format
+add_clang_tool(clang-ssaf-format
   SSAFFormat.cpp
   )
 
-clang_target_link_libraries(ssaf-format
+clang_target_link_libraries(clang-ssaf-format
   PRIVATE
   clangAnalysisScalable
   clangBasic
diff --git a/clang/tools/ssaf-format/SSAFFormat.cpp b/clang/tools/ssaf-format/SSAFFormat.cpp
index 711813053bdbb..273b1d4e68ec9 100644
--- a/clang/tools/ssaf-format/SSAFFormat.cpp
+++ b/clang/tools/ssaf-format/SSAFFormat.cpp
@@ -51,7 +51,7 @@ enum class SummaryType { TU, LU };
 // Command-Line Options
 //===----------------------------------------------------------------------===//
 
-cl::OptionCategory SsafFormatCategory("ssaf-format options");
+cl::OptionCategory SsafFormatCategory("clang-ssaf-format options");
 
 cl::list<std::string> LoadPlugins("load",
                                   cl::desc("Load a plugin shared library"),