diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 226881ad30..ebaac19800 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -573,7 +573,7 @@ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
 
 # HLSL Change Begin - Metal IR Converter
 find_package(MetalIRConverter)
-if (METAL_IRCONVERTER_FOUND)
+if (MetalIRConverter_FOUND)
   set(ENABLE_METAL_CODEGEN On)
   message(STATUS "Enabling Metal Support")
   add_definitions(-DENABLE_METAL_CODEGEN)
diff --git a/cmake/modules/FindMetalIRConverter.cmake b/cmake/modules/FindMetalIRConverter.cmake
index fc7df1d6cc..a4bbda8863 100644
--- a/cmake/modules/FindMetalIRConverter.cmake
+++ b/cmake/modules/FindMetalIRConverter.cmake
@@ -1,16 +1,16 @@
-find_path(METAL_IRCONVERTER_INCLUDE_DIR metal_irconverter.h
+find_path(MetalIRConverter_INCLUDE_DIR metal_irconverter.h
           HINTS /usr/local/include/metal_irconverter
           DOC "Path to metal IR converter headers"
           )
 
-find_library(METAL_IRCONVERTER_LIB NAMES metalirconverter
+find_library(MetalIRConverter_LIB NAMES metalirconverter
   PATH_SUFFIXES lib
   )
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(METAL_IRCONVERTER
-                                    REQUIRED_VARS METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MetalIRConverter
+                                  REQUIRED_VARS MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)
 
-message(STATUS "Metal IR Converter Include Dir: ${METAL_IRCONVERTER_INCLUDE_DIR}")
-message(STATUS "Metal IR Converter Library: ${METAL_IRCONVERTER_LIB}")
-mark_as_advanced(METAL_IRCONVERTER_LIB METAL_IRCONVERTER_INCLUDE_DIR)
+message(STATUS "Metal IR Converter Include Dir: ${MetalIRConverter_INCLUDE_DIR}")
+message(STATUS "Metal IR Converter Library: ${MetalIRConverter_LIB}")
+mark_as_advanced(MetalIRConverter_LIB MetalIRConverter_INCLUDE_DIR)
diff --git a/tools/clang/test/CMakeLists.txt b/tools/clang/test/CMakeLists.txt
index 5f0887ad84..6238196552 100644
--- a/tools/clang/test/CMakeLists.txt
+++ b/tools/clang/test/CMakeLists.txt
@@ -135,6 +135,7 @@ function(add_released_dxc name version)
       CONFIGURE_COMMAND ""
       BUILD_COMMAND ""
       INSTALL_COMMAND ""
+      DOWNLOAD_EXTRACT_TIMESTAMP NEW
   )
 endfunction()
 
diff --git a/tools/clang/tools/dxcompiler/CMakeLists.txt b/tools/clang/tools/dxcompiler/CMakeLists.txt
index 26bf0e5d98..d88e3d7a1c 100644
--- a/tools/clang/tools/dxcompiler/CMakeLists.txt
+++ b/tools/clang/tools/dxcompiler/CMakeLists.txt
@@ -135,12 +135,12 @@ if (ENABLE_SPIRV_CODEGEN)
   target_link_libraries(dxcompiler PRIVATE clangSPIRV)
 endif (ENABLE_SPIRV_CODEGEN)
 if (ENABLE_METAL_CODEGEN)
-  target_link_libraries(dxcompiler PRIVATE ${METAL_IRCONVERTER_LIB})
-  target_include_directories(dxcompiler PRIVATE ${METAL_IRCONVERTER_INCLUDE_DIR})
+  target_link_libraries(dxcompiler PRIVATE ${MetalIRConverter_LIB})
+  target_include_directories(dxcompiler PRIVATE ${MetalIRConverter_INCLUDE_DIR})
 
-  get_filename_component(METAL_IRCONVERTER_LIB_DIR ${METAL_IRCONVERTER_LIB} DIRECTORY CACHE)
+  get_filename_component(MetalIRConverter_LIB_DIR ${MetalIRConverter_LIB} DIRECTORY CACHE)
   set_property(TARGET dxcompiler APPEND_STRING
-               PROPERTY LINK_FLAGS " -Wl,-rpath,${METAL_IRCONVERTER_LIB_DIR}")
+               PROPERTY LINK_FLAGS " -Wl,-rpath,${MetalIRConverter_LIB_DIR}")
 endif (ENABLE_METAL_CODEGEN)
 include_directories(AFTER ${LLVM_INCLUDE_DIR}/dxc/Tracing ${DIASDK_INCLUDE_DIRS} ${HLSL_VERSION_LOCATION})
 include_directories(${LLVM_SOURCE_DIR}/tools/clang/tools/dxcvalidator)