diff --git a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
index 5ec07686ed2fe..29d2c4512d470 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
+++ b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
@@ -127,7 +127,7 @@ add_clang_library(clangStaticAnalyzerCheckers
   UnreachableCodeChecker.cpp
   VforkChecker.cpp
   VLASizeChecker.cpp
-  ValistChecker.cpp
+  VAListChecker.cpp
   VirtualCallChecker.cpp
   WebKit/ASTUtils.cpp
   WebKit/ForwardDeclChecker.cpp
diff --git a/clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
similarity index 99%
rename from clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp
rename to clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
index 2355abdaa060c..fe36e3b879dc0 100644
--- a/clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
@@ -1,4 +1,4 @@
-//== ValistChecker.cpp - stdarg.h macro usage checker -----------*- C++ -*--==//
+//== VAListChecker.cpp - stdarg.h macro usage checker -----------*- 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/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Checkers/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Checkers/BUILD.gn
index e5371295e6bd3..8614a7ec8354d 100644
--- a/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Checkers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/StaticAnalyzer/Checkers/BUILD.gn
@@ -135,7 +135,7 @@ static_library("Checkers") {
     "UnixAPIChecker.cpp",
     "UnreachableCodeChecker.cpp",
     "VLASizeChecker.cpp",
-    "ValistChecker.cpp",
+    "VAListChecker.cpp",
     "VforkChecker.cpp",
     "VirtualCallChecker.cpp",
     "WebKit/ASTUtils.cpp",