diff --git a/clang-tools-extra/clang-tidy/cert/SetLongJmpCheck.h b/clang-tools-extra/clang-tidy/cert/SetLongJmpCheck.h
index 242df6b4dffc..17fa11056c5d 100644
--- a/clang-tools-extra/clang-tidy/cert/SetLongJmpCheck.h
+++ b/clang-tools-extra/clang-tidy/cert/SetLongJmpCheck.h
@@ -18,7 +18,7 @@ namespace tidy {
 /// Guards against use of setjmp/longjmp in C++ code
 ///
 /// For the user-facing documentation see:
-/// http://clang.llvm.org/extra/clang-tidy/checks/cert-setlongjmp.html
+/// http://clang.llvm.org/extra/clang-tidy/checks/cert-err52-cpp.html
 class SetLongJmpCheck : public ClangTidyCheck {
 public:
   SetLongJmpCheck(StringRef Name, ClangTidyContext *Context)
diff --git a/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.h b/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.h
index 625aa03ed89f..14dfb08a9a82 100644
--- a/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.h
+++ b/clang-tools-extra/clang-tidy/cert/StaticObjectExceptionCheck.h
@@ -19,7 +19,7 @@ namespace tidy {
 /// throw.
 ///
 /// For the user-facing documentation see:
-/// http://clang.llvm.org/extra/clang-tidy/checks/cert-static-object-exception.html
+/// http://clang.llvm.org/extra/clang-tidy/checks/cert-err58-cpp.html
 class StaticObjectExceptionCheck : public ClangTidyCheck {
 public:
   StaticObjectExceptionCheck(StringRef Name, ClangTidyContext *Context)
diff --git a/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.h b/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.h
index e4c27f3552c6..0b1d5f31eef0 100644
--- a/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.h
+++ b/clang-tools-extra/clang-tidy/cert/ThrownExceptionTypeCheck.h
@@ -18,7 +18,7 @@ namespace tidy {
 /// Checks whether a thrown object is nothrow copy constructible.
 ///
 /// For the user-facing documentation see:
-/// http://clang.llvm.org/extra/clang-tidy/checks/cert-thrown-exception-type.html
+/// http://clang.llvm.org/extra/clang-tidy/checks/cert-err60-cpp.html
 class ThrownExceptionTypeCheck : public ClangTidyCheck {
 public:
   ThrownExceptionTypeCheck(StringRef Name, ClangTidyContext *Context)
diff --git a/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.h b/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.h
index 9ee868331047..746306314ac1 100644
--- a/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.h
+++ b/clang-tools-extra/clang-tidy/cert/VariadicFunctionDefCheck.h
@@ -18,7 +18,7 @@ namespace tidy {
 /// Guards against any C-style variadic function definitions (not declarations).
 ///
 /// For the user-facing documentation see:
-/// http://clang.llvm.org/extra/clang-tidy/checks/cert-variadic-function-def.html
+/// http://clang.llvm.org/extra/clang-tidy/checks/cert-dcl50-cpp.html
 class VariadicFunctionDefCheck : public ClangTidyCheck {
 public:
   VariadicFunctionDefCheck(StringRef Name, ClangTidyContext *Context)
diff --git a/clang-tools-extra/docs/clang-tidy/checks/cert-variadic-function-def.rst b/clang-tools-extra/docs/clang-tidy/checks/cert-dcl50-cpp.rst
similarity index 100%
rename from clang-tools-extra/docs/clang-tidy/checks/cert-variadic-function-def.rst
rename to clang-tools-extra/docs/clang-tidy/checks/cert-dcl50-cpp.rst
diff --git a/clang-tools-extra/docs/clang-tidy/checks/cert-setlongjmp.rst b/clang-tools-extra/docs/clang-tidy/checks/cert-err52-cpp.rst
similarity index 100%
rename from clang-tools-extra/docs/clang-tidy/checks/cert-setlongjmp.rst
rename to clang-tools-extra/docs/clang-tidy/checks/cert-err52-cpp.rst
diff --git a/clang-tools-extra/docs/clang-tidy/checks/cert-static-object-exception.rst b/clang-tools-extra/docs/clang-tidy/checks/cert-err58-cpp.rst
similarity index 100%
rename from clang-tools-extra/docs/clang-tidy/checks/cert-static-object-exception.rst
rename to clang-tools-extra/docs/clang-tidy/checks/cert-err58-cpp.rst
diff --git a/clang-tools-extra/docs/clang-tidy/checks/cert-thrown-exception-type.rst b/clang-tools-extra/docs/clang-tidy/checks/cert-err60-cpp.rst
similarity index 100%
rename from clang-tools-extra/docs/clang-tidy/checks/cert-thrown-exception-type.rst
rename to clang-tools-extra/docs/clang-tidy/checks/cert-err60-cpp.rst
diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
index bd60a325f567..20bc8063b687 100644
--- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
+++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
@@ -4,10 +4,10 @@ Clang-Tidy Checks
 =========================
 
 .. toctree::   
-   cert-setlongjmp
-   cert-static-object-exception
-   cert-thrown-exception-type
-   cert-variadic-function-def
+   cert-dcl50-cpp
+   cert-err52-cpp
+   cert-err58-cpp
+   cert-err60-cpp
    cppcoreguidelines-pro-bounds-array-to-pointer-decay
    cppcoreguidelines-pro-bounds-constant-array-index
    cppcoreguidelines-pro-bounds-pointer-arithmetic