diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index b4744aa172..8d1eca84d7 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -85,8 +85,8 @@ macro(GENERATE_INSTALLERS)
 
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
-  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Client")
-  cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Server")
+  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
+  cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
 
   include(CPack)
 endmacro()
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 92e3273f67..1886ca36ac 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -53,7 +53,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
     set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
 
-    set(CONSOLE_EXEC_NAME "Server Console.app")
+    set(CONSOLE_EXEC_NAME "Sandbox.app")
     set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
 
     set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
@@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
   else ()
     if (WIN32)
-      set(CONSOLE_INSTALL_DIR "server-console")
+      set(CONSOLE_INSTALL_DIR "sandbox")
     else ()
       set(CONSOLE_INSTALL_DIR ".")
     endif ()
@@ -77,18 +77,18 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_EXEC_PREFIX "interface")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
 
-    set(CONSOLE_EXEC_NAME "server-console.exe")
+    set(CONSOLE_EXEC_NAME "sandbox.exe")
 
     set(DS_EXEC_NAME "domain-server.exe")
     set(AC_EXEC_NAME "assignment-client.exe")
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity")
-      set(CONSOLE_SHORTCUT_NAME "Server Console")
+      set(INTERFACE_SHORTCUT_NAME "Interface")
+      set(CONSOLE_SHORTCUT_NAME "Sandbox")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION}")
-      set(CONSOLE_SHORTCUT_NAME "Server Console - ${BUILD_VERSION}")
+      set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}")
+      set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}")
     endif ()
     # check if we need to find signtool
     if (PRODUCTION_BUILD OR PR_BUILD)