diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index acafd9b6c7..91f8d49426 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -18,20 +18,20 @@ macro(GENERATE_INSTALLERS)
   if (CLIENT_ONLY)
     set(_PACKAGE_NAME_EXTRA "-Interface")
     set(INSTALLER_TYPE "client_only")
-    string(REGEX REPLACE "High Fidelity" "High Fidelity Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
+    string(REGEX REPLACE "Project Athena" "Project Athena Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
   elseif (SERVER_ONLY)
     set(_PACKAGE_NAME_EXTRA "-Sandbox")
     set(INSTALLER_TYPE "server_only")
-    string(REGEX REPLACE "High Fidelity" "High Fidelity Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION})
+    string(REGEX REPLACE "Project Athena" "Project Athena Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION})
   else ()
     set(_DISPLAY_NAME ${BUILD_ORGANIZATION})
     set(INSTALLER_TYPE "full")
   endif ()
 
   set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
-  set(CPACK_PACKAGE_VENDOR "High Fidelity")
+  set(CPACK_PACKAGE_VENDOR "Project Athena")
   set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
-  set(CPACK_PACKAGE_FILE_NAME "HighFidelity-Beta${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
+  set(CPACK_PACKAGE_FILE_NAME "ProjectAthena-Beta${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
   set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
   set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
   if (PR_BUILD)
@@ -118,11 +118,11 @@ macro(GENERATE_INSTALLERS)
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
   if (BUILD_CLIENT)
-    cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
+    cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "Project Athena Interface")
   endif ()
 
   if (BUILD_SERVER)
-    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
+    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Project Athena Sandbox")
   endif ()
 
   include(CPack)
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index bf98dba29d..83ec983775 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -35,7 +35,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(DEPLOY_PACKAGE TRUE)
     set(PRODUCTION_BUILD 1)
     set(BUILD_VERSION ${RELEASE_NUMBER})
-    set(BUILD_ORGANIZATION "High Fidelity")
+    set(BUILD_ORGANIZATION "Project Athena")
     set(HIGH_FIDELITY_PROTOCOL "hifi")
     set(HIGH_FIDELITY_APP_PROTOCOL "hifiapp")
     set(INTERFACE_BUNDLE_NAME "interface")
@@ -60,7 +60,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(DEPLOY_PACKAGE TRUE)
     set(PR_BUILD 1)
     set(BUILD_VERSION "PR${RELEASE_NUMBER}")
-    set(BUILD_ORGANIZATION "High Fidelity - PR${RELEASE_NUMBER}")
+    set(BUILD_ORGANIZATION "Project Athena - PR${RELEASE_NUMBER}")
     set(INTERFACE_BUNDLE_NAME "interface")
     set(INTERFACE_ICON_PREFIX "interface-beta")
 
@@ -69,7 +69,7 @@ macro(SET_PACKAGING_PARAMETERS)
   else ()
     set(DEV_BUILD 1)
     set(BUILD_VERSION "dev")
-    set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}")
+    set(BUILD_ORGANIZATION "Project Athena - ${BUILD_VERSION}")
     set(INTERFACE_BUNDLE_NAME "interface")
     set(INTERFACE_ICON_PREFIX "interface-beta")
 
@@ -192,21 +192,21 @@ macro(SET_PACKAGING_PARAMETERS)
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity")
+      set(INTERFACE_SHORTCUT_NAME "Project Athena")
       set(CONSOLE_SHORTCUT_NAME "Console")
       set(SANDBOX_SHORTCUT_NAME "Sandbox")
       set(APP_USER_MODEL_ID "com.highfidelity.console")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION_NO_SHA}")
+      set(INTERFACE_SHORTCUT_NAME "Project Athena - ${BUILD_VERSION_NO_SHA}")
       set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
       set(SANDBOX_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
     endif ()
 
     set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")
-    set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}")
-    set(SANDBOX_HF_SHORTCUT_NAME "High Fidelity ${SANDBOX_SHORTCUT_NAME}")
+    set(CONSOLE_HF_SHORTCUT_NAME "Project Athenay ${CONSOLE_SHORTCUT_NAME}")
+    set(SANDBOX_HF_SHORTCUT_NAME "Project Athena ${SANDBOX_SHORTCUT_NAME}")
 	
-    set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity")
+    set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "Project Athena")
     set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console")
 
     # check if we need to find signtool