diff --git a/include/dxc/HLSL/DxilShaderModel.h b/include/dxc/HLSL/DxilShaderModel.h
index 119327e55..6289bd8f6 100644
--- a/include/dxc/HLSL/DxilShaderModel.h
+++ b/include/dxc/HLSL/DxilShaderModel.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "dxc/HLSL/DXILConstants.h"
+#include "dxc/HLSL/DxilConstants.h"
 #include <string>
 
 
diff --git a/include/dxc/Support/Global.h b/include/dxc/Support/Global.h
index ffafe6ad4..a29d64ca0 100644
--- a/include/dxc/Support/Global.h
+++ b/include/dxc/Support/Global.h
@@ -23,7 +23,7 @@ typedef _Return_type_success_(return >= 0) long HRESULT;
 #endif // !_HRESULT_DEFINED
 
 #include <stdarg.h>
-#include "dxc/Support/Exception.h"
+#include "dxc/Support/exception.h"
 
 namespace std { class error_code; }
 void CheckLLVMErrorCode(const std::error_code &ec);
diff --git a/lib/Analysis/CMakeLists.txt b/lib/Analysis/CMakeLists.txt
index 13acf5d64..487842dc4 100644
--- a/lib/Analysis/CMakeLists.txt
+++ b/lib/Analysis/CMakeLists.txt
@@ -51,9 +51,9 @@ add_llvm_library(LLVMAnalysis
   PHITransAddr.cpp
   PostDominators.cpp
   PtrUseVisitor.cpp
-  RegionInfo.cpp
+  regioninfo.cpp
   RegionPass.cpp
-  RegionPrinter.cpp
+  regionprinter.cpp
   ScalarEvolution.cpp
   ScalarEvolutionAliasAnalysis.cpp
   ScalarEvolutionExpander.cpp
diff --git a/lib/HLSL/CMakeLists.txt b/lib/HLSL/CMakeLists.txt
index aa5f1ab44..0ab45eefa 100644
--- a/lib/HLSL/CMakeLists.txt
+++ b/lib/HLSL/CMakeLists.txt
@@ -12,7 +12,7 @@ add_llvm_library(LLVMHLSL
   DxilLegalizeSampleOffsetPass.cpp
   DxilMetadataHelper.cpp
   DxilModule.cpp
-  DXILOperations.cpp
+  DxilOperations.cpp
   DxilResource.cpp
   DxilResourceBase.cpp
   DxilRootSignature.cpp
diff --git a/lib/HLSL/WaveSensitivityAnalysis.cpp b/lib/HLSL/WaveSensitivityAnalysis.cpp
index 40f93c452..dbdff4f65 100644
--- a/lib/HLSL/WaveSensitivityAnalysis.cpp
+++ b/lib/HLSL/WaveSensitivityAnalysis.cpp
@@ -12,7 +12,7 @@
 
 #include "dxc/HLSL/DxilValidation.h"
 #include "dxc/HLSL/DxilGenerationPass.h"
-#include "dxc/HLSL/DXILOperations.h"
+#include "dxc/HLSL/DxilOperations.h"
 #include "dxc/HLSL/DxilModule.h"
 #include "dxc/HLSL/DxilShaderModel.h"
 #include "dxc/HLSL/DxilContainer.h"
diff --git a/tools/clang/lib/CodeGen/CGHLSLMS.cpp b/tools/clang/lib/CodeGen/CGHLSLMS.cpp
index f20534cb2..fc879c415 100644
--- a/tools/clang/lib/CodeGen/CGHLSLMS.cpp
+++ b/tools/clang/lib/CodeGen/CGHLSLMS.cpp
@@ -18,7 +18,7 @@
 #include "dxc/HLSL/HLMatrixLowerHelper.h"
 #include "dxc/HLSL/HLModule.h"
 #include "dxc/HLSL/HLOperations.h"
-#include "dxc/HLSL/DXILOperations.h"
+#include "dxc/HLSL/DxilOperations.h"
 #include "dxc/HLSL/DxilTypeSystem.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/HlslTypes.h"