diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index b1230460d4..345fdda4a4 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -140,9 +140,9 @@ macro(SET_PACKAGING_PARAMETERS)
 
     set(DMG_SUBFOLDER_ICON "${HF_CMAKE_DIR}/installer/install-folder.rsrc")
 
-    set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
+    set(CONSOLE_INSTALL_DIR   ${DMG_SUBFOLDER_NAME})
     set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
-    set(NITPICK_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
+    set(NITPICK_INSTALL_DIR   ${DMG_SUBFOLDER_NAME})
 
     if (CLIENT_ONLY)
       set(CONSOLE_EXEC_NAME "Console.app")
@@ -150,8 +150,6 @@ macro(SET_PACKAGING_PARAMETERS)
       set(CONSOLE_EXEC_NAME "Sandbox.app")
     endif()
 
-    set(NITPICK_EXEC_NAME "nitpick")
-
     set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
 
     set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index 959eba4c56..79fa7394be 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -73,12 +73,8 @@ elseif (APPLE)
     )
 endif ()
 
-# set the packaged nitpick folder depending on platform, so we can copy it
-if (APPLE)
-  set(PACKAGED_NITPICK_FOLDER "Release/${NITPICK_EXEC_NAME}")
-elseif (WIN32)
-  set(PACKAGED_NITPICK_FOLDER "Release")
-endif ()
+# set the packaged nitpick folder so we can copy it
+set(PACKAGED_NITPICK_FOLDER "Release")
 
 if (APPLE)
   install(