diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index a3a2d0984..feb6936e8 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -8,7 +8,7 @@ set (CPACK_PACKAGE_DESCRIPTION_FILE "@PROJECT_SOURCE_DIR@/Copyright.txt")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_SUMMARY_DESCRIPTION@")
 set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/license.txt")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set (CPACK_PACKAGE_EXECUTABLES wsjtx "WSJT-X")
+set (CPACK_PACKAGE_EXECUTABLES wsjtx "@PROJECT_NAME@")
 set (CPACK_CREATE_DESKTOP_LINKS wsjtx)
 set (CPACK_STRIP_FILES TRUE)
 
@@ -16,7 +16,7 @@ set (CPACK_STRIP_FILES TRUE)
 # components
 #
 #set (CPACK_COMPONENTS_ALL Unspecified Runtime)
-#set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "WSJT-X Application")
+#set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "@PROJECT_NAME@ Application")
 #set (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@")
 
 if (CPACK_GENERATOR MATCHES "NSIS")
@@ -32,8 +32,8 @@ if (CPACK_GENERATOR MATCHES "NSIS")
   set (CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\installer_logo.bmp")
   # tell cpack to create links to the doc files
   set (CPACK_NSIS_MENU_LINKS
-    "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@" "WSJT-X Documentation"
-    "@PROJECT_HOMEPAGE@" "WSJT-X Web Site"
+    "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@" "@PROJECT_NAME@ Documentation"
+    "@PROJECT_HOMEPAGE@" "@PROJECT_NAME@ Web Site"
     )
   # Use the icon from wsjtx for add-remove programs
   set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx.exe")
@@ -53,6 +53,7 @@ if ("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
 endif ()
 
 if ("${CPACK_GENERATOR}" STREQUAL "DragNDrop")
+  set (CPACK_DMG_VOLUME_NAME "@PROJECT_NAME@")
   set (CPACK_DMG_BACKGROUND_IMAGE "@PROJECT_SOURCE_DIR@/icons/Darwin/DragNDrop Background.png")
   set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/wsjtx_DMG.DS_Store")
   set (CPACK_BUNDLE_NAME "@WSJTX_BUNDLE_NAME@")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45a08024c..529544249 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,16 @@ project (wsjtx C CXX Fortran)
 #
 # project information
 #
+set (PROJECT_NAME "WSJT-X")
 set (PROJECT_VENDOR "Joe Taylor, K1JT")
 set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>")
 set (PROJECT_COPYRIGHT "Copyright (C) 2001-2014 by Joe Taylor, K1JT")
 set (PROJECT_HOMEPAGE "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html")
 set (PROJECT_MANUAL wsjtx-main.html)
 set (PROJECT_MANUAL_DIRECTORY_URL http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc)
-set (PROJECT_SUMMARY_DESCRIPTION "WSJT-X - JT9 and JT65 Modes for LF, MF and HF Amateur Radio.")
+set (PROJECT_SUMMARY_DESCRIPTION "${PROJECT_NAME} - JT9 and JT65 Modes for LF, MF and HF Amateur Radio.")
 set (PROJECT_DESCRIPTION "${PROJECT_SUMMARY_DESCRIPTION}
- WSJT-X implements JT9, a new mode designed especially for the LF, MF,
+ ${PROJECT_NAME} implements JT9, a new mode designed especially for the LF, MF,
  and HF bands, as well as the popular mode JT65. Both modes were
  designed for making reliable, confirmed QSOs under extreme
  weak-signal conditions. They use nearly identical message structure
@@ -27,14 +28,14 @@ set (PROJECT_DESCRIPTION "${PROJECT_SUMMARY_DESCRIPTION}
  As many as 100 JT9 signals can fit into the same space, without
  overlap.
  .
- WSJT-X offers a “bi-lingual“ operating mode in which you can transmit
+ ${PROJECT_NAME} offers a “bi-lingual“ operating mode in which you can transmit
  and receive JT65 and JT9 signals, switching between modes
  automatically as needed. Displayed bandwidth can be as large as 5
  kHz. If your receiver has as upper-sideband filter at least 4 kHz
  wide, you can have all the typical JT65 and JT9 activity on screen at
  once, available for making QSOs with a click of the mouse. Even with
  standard SSB-width IF filters, switching between JT65 and JT9 modes
- is quick and convenient. Be sure to read the online WSJT-X User's
+ is quick and convenient. Be sure to read the online ${PROJECT_NAME} User's
  Guide.")
 
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake/Modules)
@@ -495,7 +496,7 @@ FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_"
 add_custom_target (user_manual ALL
   # OUTPUT contrib/${PROJECT_MANUAL}
   ${CMAKE_COMMAND} -D URL=${PROJECT_MANUAL_DIRECTORY_URL} -D NAME=${PROJECT_MANUAL} -P ${CMAKE_SOURCE_DIR}/CMake/download_html_manual.cmake
-  COMMENT "Downloading WSJT-X HTML manual"
+  COMMENT "Downloading ${PROJECT_NAME} HTML manual"
   VERBATIM
   )
 
@@ -702,7 +703,7 @@ set_target_properties (wsjtx PROPERTIES
   MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
   MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}"
   MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}"
-  MACOSX_BUNDLE_BUNDLE_NAME "WSJT-X"
+  MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
   MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
   )
 
diff --git a/Darwin/wsjtx_DMG.DS_Store b/Darwin/wsjtx_DMG.DS_Store
index ae14cb10c..15d5d90ce 100644
Binary files a/Darwin/wsjtx_DMG.DS_Store and b/Darwin/wsjtx_DMG.DS_Store differ