diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83ab275d28..dfc7c842a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,9 +180,9 @@ else ()
   set(UPPER_CMAKE_BUILD_TYPE DEBUG)
 endif ()
 
-set(HIFI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros")
-set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals")
+set(HF_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(MACRO_DIR "${HF_CMAKE_DIR}/macros")
+set(EXTERNAL_PROJECT_DIR "${HF_CMAKE_DIR}/externals")
 
 file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
 foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 26b32463eb..788bab9ff4 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -12,6 +12,8 @@
 macro(GENERATE_INSTALLERS)
   include(CPackComponent)
 
+  set(CPACK_MODULE_PATH ${CPACK_MODULE_PATH} "${HF_CMAKE_DIR}/templates")
+
   set(CPACK_PACKAGE_NAME "High Fidelity")
   set(CPACK_PACKAGE_VENDOR "High Fidelity")
 
diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake
index 44d609c064..322afc52e0 100644
--- a/cmake/macros/PackageLibrariesForDeployment.cmake
+++ b/cmake/macros/PackageLibrariesForDeployment.cmake
@@ -13,7 +13,7 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
 
   if (WIN32)
     configure_file(
-      ${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in
+      ${HF_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in
       ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
       @ONLY
     )