diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
index 0f2a352886e7f..e38c254709980 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -117,17 +117,17 @@ add_clang_library(clangCodeGen
   PatternInit.cpp
   SanitizerMetadata.cpp
   SwiftCallingConv.cpp
-  TargetBuiltins/ARM.cpp
-  TargetBuiltins/AMDGPU.cpp
-  TargetBuiltins/DirectX.cpp
-  TargetBuiltins/Hexagon.cpp
-  TargetBuiltins/NVPTX.cpp
-  TargetBuiltins/PPC.cpp
-  TargetBuiltins/RISCV.cpp
-  TargetBuiltins/SPIR.cpp
-  TargetBuiltins/SystemZ.cpp
-  TargetBuiltins/WebAssembly.cpp
-  TargetBuiltins/X86.cpp
+  TargetBuiltins/TargetBuiltinsARM.cpp
+  TargetBuiltins/TargetBuiltinsAMDGPU.cpp
+  TargetBuiltins/TargetBuiltinsDirectX.cpp
+  TargetBuiltins/TargetBuiltinsHexagon.cpp
+  TargetBuiltins/TargetBuiltinsNVPTX.cpp
+  TargetBuiltins/TargetBuiltinsPPC.cpp
+  TargetBuiltins/TargetBuiltinsRISCV.cpp
+  TargetBuiltins/TargetBuiltinsSPIR.cpp
+  TargetBuiltins/TargetBuiltinsSystemZ.cpp
+  TargetBuiltins/TargetBuiltinsWebAssembly.cpp
+  TargetBuiltins/TargetBuiltinsX86.cpp
   TargetInfo.cpp
   Targets/AArch64.cpp
   Targets/AMDGPU.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsAMDGPU.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsAMDGPU.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/ARM.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsARM.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/ARM.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsARM.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/DirectX.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsDirectX.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/DirectX.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsDirectX.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/Hexagon.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsHexagon.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/Hexagon.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsHexagon.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/NVPTX.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsNVPTX.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/NVPTX.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsNVPTX.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/PPC.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsPPC.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/PPC.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsPPC.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/RISCV.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsRISCV.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/RISCV.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsRISCV.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/SPIR.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsSPIR.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/SPIR.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsSPIR.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/SystemZ.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsSystemZ.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/SystemZ.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsSystemZ.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/WebAssembly.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsWebAssembly.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/WebAssembly.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsWebAssembly.cpp
diff --git a/clang/lib/CodeGen/TargetBuiltins/X86.cpp b/clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsX86.cpp
similarity index 100%
rename from clang/lib/CodeGen/TargetBuiltins/X86.cpp
rename to clang/lib/CodeGen/TargetBuiltins/TargetBuiltinsX86.cpp