diff --git a/test/atomics/atomics.general/nothing_to_do.pass.cpp b/test/atomics/atomics.general/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/atomics/atomics.general/nothing_to_do.pass.cpp
+++ b/test/atomics/atomics.general/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/atomics/atomics.syn/nothing_to_do.pass.cpp b/test/atomics/atomics.syn/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/atomics/atomics.syn/nothing_to_do.pass.cpp
+++ b/test/atomics/atomics.syn/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/depr/depr.c.headers/errno_h.pass.cpp b/test/depr/depr.c.headers/errno_h.pass.cpp
index 185ba7bce..b6c18b268 100644
--- a/test/depr/depr.c.headers/errno_h.pass.cpp
+++ b/test/depr/depr.c.headers/errno_h.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/diagnostics/errno/cerrno.pass.cpp b/test/diagnostics/errno/cerrno.pass.cpp
index 6944a7678..c445c6f14 100644
--- a/test/diagnostics/errno/cerrno.pass.cpp
+++ b/test/diagnostics/errno/cerrno.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/nothing_to_do.pass.cpp b/test/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/nothing_to_do.pass.cpp
+++ b/test/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.badexp/regex_error.pass.cpp b/test/re/re.badexp/regex_error.pass.cpp
index 849e372e4..9c9155e51 100644
--- a/test/re/re.badexp/regex_error.pass.cpp
+++ b/test/re/re.badexp/regex_error.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.const/nothing_to_do.pass.cpp b/test/re/re.const/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.const/nothing_to_do.pass.cpp
+++ b/test/re/re.const/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.const/re.err/error_type.pass.cpp b/test/re/re.const/re.err/error_type.pass.cpp
index 06414a347..f2855696c 100644
--- a/test/re/re.const/re.err/error_type.pass.cpp
+++ b/test/re/re.const/re.err/error_type.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.const/re.matchflag/match_flag_type.pass.cpp b/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
index 356fc5726..7abd2962e 100644
--- a/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
+++ b/test/re/re.const/re.matchflag/match_flag_type.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.const/re.synopt/syntax_option_type.pass.cpp b/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
index 473b6e556..a6958bd36 100644
--- a/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
+++ b/test/re/re.const/re.synopt/syntax_option_type.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.collating.element/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.finite.state.machine/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.format.specifier/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.matched/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.primary.equivalence.class/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.regular.expression/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp b/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
+++ b/test/re/re.def/defns.regex.subexpression/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.def/nothing_to_do.pass.cpp b/test/re/re.def/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.def/nothing_to_do.pass.cpp
+++ b/test/re/re.def/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.general/nothing_to_do.pass.cpp b/test/re/re.general/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.general/nothing_to_do.pass.cpp
+++ b/test/re/re.general/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.req/nothing_to_do.pass.cpp b/test/re/re.req/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/re/re.req/nothing_to_do.pass.cpp
+++ b/test/re/re.req/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/default.pass.cpp b/test/re/re.traits/default.pass.cpp
index 0e071e8d0..6414a4b9d 100644
--- a/test/re/re.traits/default.pass.cpp
+++ b/test/re/re.traits/default.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/length.pass.cpp b/test/re/re.traits/length.pass.cpp
index 7a30708ce..ac896c4a4 100644
--- a/test/re/re.traits/length.pass.cpp
+++ b/test/re/re.traits/length.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/transform.pass.cpp b/test/re/re.traits/transform.pass.cpp
index 252811291..81419e94e 100644
--- a/test/re/re.traits/transform.pass.cpp
+++ b/test/re/re.traits/transform.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/transform_primary.pass.cpp b/test/re/re.traits/transform_primary.pass.cpp
index c9ea1eb6a..06d6c4a8f 100644
--- a/test/re/re.traits/transform_primary.pass.cpp
+++ b/test/re/re.traits/transform_primary.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/translate.pass.cpp b/test/re/re.traits/translate.pass.cpp
index c584e1a77..067e125a0 100644
--- a/test/re/re.traits/translate.pass.cpp
+++ b/test/re/re.traits/translate.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/translate_nocase.pass.cpp b/test/re/re.traits/translate_nocase.pass.cpp
index cc0079f64..0c67d2058 100644
--- a/test/re/re.traits/translate_nocase.pass.cpp
+++ b/test/re/re.traits/translate_nocase.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/re/re.traits/types.pass.cpp b/test/re/re.traits/types.pass.cpp
index c3972cd54..5dc85e744 100644
--- a/test/re/re.traits/types.pass.cpp
+++ b/test/re/re.traits/types.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/strings/strings.general/nothing_to_do.pass.cpp b/test/strings/strings.general/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/strings/strings.general/nothing_to_do.pass.cpp
+++ b/test/strings/strings.general/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/test/thread/futures/futures.state/nothing_to_do.pass.cpp b/test/thread/futures/futures.state/nothing_to_do.pass.cpp
index b85601fc4..256c0e2a2 100644
--- a/test/thread/futures/futures.state/nothing_to_do.pass.cpp
+++ b/test/thread/futures/futures.state/nothing_to_do.pass.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //