diff --git a/tools/llvmc2/AutoGenerated.cpp b/tools/llvmc2/AutoGenerated.cpp
index 2bd624afccc..213db01e0bc 100644
--- a/tools/llvmc2/AutoGenerated.cpp
+++ b/tools/llvmc2/AutoGenerated.cpp
@@ -1,4 +1,4 @@
-//===--- Tools.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===//
+//===--- AutoGenerated.cpp - The LLVM Compiler Driver -----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/tools/llvmc2/AutoGenerated.h b/tools/llvmc2/AutoGenerated.h
index 106a04ef845..5ace7d2a943 100644
--- a/tools/llvmc2/AutoGenerated.h
+++ b/tools/llvmc2/AutoGenerated.h
@@ -1,4 +1,4 @@
-//===--- Tools.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===//
+//===--- AutoGenerated.h - The LLVM Compiler Driver -------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/tools/llvmc2/Common.td b/tools/llvmc2/Common.td
index a7515b8f0f2..524ea56728d 100644
--- a/tools/llvmc2/Common.td
+++ b/tools/llvmc2/Common.td
@@ -1,4 +1,4 @@
-//===- Tools.td - Common definitions for LLVMCC  -----------*- tablegen -*-===//
+//===- Common.td - Common definitions for LLVMCC  ----------*- tablegen -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/tools/llvmc2/Graph.td b/tools/llvmc2/Graph.td
index 5c2902e288f..fb48ffb7c2f 100644
--- a/tools/llvmc2/Graph.td
+++ b/tools/llvmc2/Graph.td
@@ -1,4 +1,4 @@
-//===- Example.td - LLVMCC toolchain descriptions  ---------*- tablegen -*-===//
+//===- Graph.td - LLVMCC toolchain descriptions ------------*- tablegen -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/tools/llvmc2/Tool.h b/tools/llvmc2/Tool.h
index ec9d1546ffd..4762b1ee65d 100644
--- a/tools/llvmc2/Tool.h
+++ b/tools/llvmc2/Tool.h
@@ -1,4 +1,4 @@
-//===--- Tools.h - The LLVM Compiler Driver ---------------------*- C++ -*-===//
+//===--- Tool.h - The LLVM Compiler Driver ----------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/tools/llvmc2/llvmc.cpp b/tools/llvmc2/llvmc.cpp
index c06ea59ed9a..403e61da903 100644
--- a/tools/llvmc2/llvmc.cpp
+++ b/tools/llvmc2/llvmc.cpp
@@ -1,4 +1,4 @@
-//===--- llvmc.cpp - The LLVM Compiler Driver ------------------*- C++ -*-===//
+//===--- llvmc.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 0b6e8d7f34c..f296e7bd79f 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -1,4 +1,4 @@
-//===- LLVMCConfigurationEmitter.cpp - Generate LLVMC config --------------===//
+//===- LLVMCConfigurationEmitter.cpp - Generate LLVMC config ----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.h b/utils/TableGen/LLVMCConfigurationEmitter.h
index 164f12d1460..98c4bc06956 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.h
+++ b/utils/TableGen/LLVMCConfigurationEmitter.h
@@ -1,4 +1,4 @@
-//===- LLVMCConfigurationEmitter.cpp - Generate LLVMCC config -------------===//
+//===- LLVMCConfigurationEmitter.cpp - Generate LLVMCC config ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //