diff --git a/tools/llvm-exegesis/lib/RegisterAliasing.cpp b/tools/llvm-exegesis/lib/RegisterAliasing.cpp
index 9c2653707ca..ac1543cb2d4 100644
--- a/tools/llvm-exegesis/lib/RegisterAliasing.cpp
+++ b/tools/llvm-exegesis/lib/RegisterAliasing.cpp
@@ -1,4 +1,4 @@
-//===-- RegisterAliasingTracker.cpp -----------------------------*- C++ -*-===//
+//===-- RegisterAliasing.cpp ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-isel-fuzzer/DummyISelFuzzer.cpp b/tools/llvm-isel-fuzzer/DummyISelFuzzer.cpp
index 82fbd73e387..0674b4714cf 100644
--- a/tools/llvm-isel-fuzzer/DummyISelFuzzer.cpp
+++ b/tools/llvm-isel-fuzzer/DummyISelFuzzer.cpp
@@ -1,4 +1,4 @@
-//===--- DummyFuzzerMain.cpp - Entry point to sanity check the fuzzer -----===//
+//===-- DummyISelFuzzer.cpp - Entry point to sanity check the fuzzer ------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp b/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
index f305ca5a800..201fdd79888 100644
--- a/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
+++ b/tools/llvm-itanium-demangle-fuzzer/DummyDemanglerFuzzer.cpp
@@ -1,4 +1,4 @@
-//===--- DummyDemanglerMain.cpp - Entry point to sanity check the fuzzer --===//
+//===-- DummyDemanglerFuzzer.cpp - Entry point to sanity check the fuzzer -===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-mc-disassemble-fuzzer/llvm-mc-disassemble-fuzzer.cpp b/tools/llvm-mc-disassemble-fuzzer/llvm-mc-disassemble-fuzzer.cpp
index ecc415bf8ad..f998c465104 100644
--- a/tools/llvm-mc-disassemble-fuzzer/llvm-mc-disassemble-fuzzer.cpp
+++ b/tools/llvm-mc-disassemble-fuzzer/llvm-mc-disassemble-fuzzer.cpp
@@ -1,4 +1,4 @@
-//===--- llvm-mc-fuzzer.cpp - Fuzzer for the MC layer ---------------------===//
+//===-- llvm-mc-disassemble-fuzzer.cpp - Fuzzer for the MC layer ----------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-pdbutil/PdbYaml.cpp b/tools/llvm-pdbutil/PdbYaml.cpp
index d1c404237d9..ff634fbb048 100644
--- a/tools/llvm-pdbutil/PdbYaml.cpp
+++ b/tools/llvm-pdbutil/PdbYaml.cpp
@@ -1,4 +1,4 @@
-//===- PdbYAML.cpp -------------------------------------------- *- C++ --*-===//
+//===-- PdbYaml.cpp ------------------------------------------- *- C++ --*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-readobj/MachODumper.cpp b/tools/llvm-readobj/MachODumper.cpp
index 259f30de0be..1c3e33806b7 100644
--- a/tools/llvm-readobj/MachODumper.cpp
+++ b/tools/llvm-readobj/MachODumper.cpp
@@ -1,4 +1,4 @@
-//===-- MachODump.cpp - Object file dumping utility for llvm --------------===//
+//===- MachODumper.cpp - Object file dumping utility for llvm -------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp b/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp
index 039c3dc5999..3f50d60bc12 100644
--- a/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp
+++ b/tools/llvm-yaml-numeric-parser-fuzzer/yaml-numeric-parser-fuzzer.cpp
@@ -1,4 +1,4 @@
-//===--- special-case-list-fuzzer.cpp - Fuzzer for special case lists -----===//
+//===-- yaml-numeric-parser-fuzzer.cpp - Fuzzer for YAML numeric parser ---===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.