diff --git a/CMakeLists.txt b/CMakeLists.txt
index b272970925..0a763cb064 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,8 @@ endif()
 set_packaging_parameters()
 
 # setup component categories for installer
-set(APP_COMPONENT Runtime)
+set(CLIENT_COMPONENT client)
+set(SERVER_COMPONENT server)
 
 # add subdirectories for all targets
 if (NOT ANDROID)
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index f79c3528bf..9b8b4b1b80 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -12,21 +12,26 @@
 macro(GENERATE_INSTALLERS)
   include(CPackComponent)
 
+  set(CPACK_PACKAGE_NAME "High Fidelity")
+  set(CPACK_PACKAGE_VENDOR "High Fidelity, Inc.")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "High Fidelity")
+
   if (APPLE)
     install(TARGETS ${CLIENT_TARGET} BUNDLE DESTINATION bin COMPONENT ${APP_COMPONENT})
   else ()
     install(TARGETS ${CLIENT_TARGET} RUNTIME DESTINATION bin COMPONENT ${APP_COMPONENT})
   endif ()
 
-  cpack_add_component(${APP_COMPONENT}
-    DISPLAY_NAME "Applications"
-    Description "The High Fidelity Applications"
-    GROUP "Runtime"
+  cpack_add_component(${CLIENT_COMPONENT}
+    DISPLAY_NAME "High Fidelity Client"
   )
 
-  cpack_add_component_group(Runtime)
+  cpack_add_component(${SERVER_COMPONENT}
+    DISPLAY_NAME "High Fidelity Server"
+  )
 
   include(CPack)
+
   # if (DEPLOY_PACKAGE AND WIN32)
   #   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/package-bundle")
   #   find_program(MAKENSIS_COMMAND makensis PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\NSIS])
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index cc2faa2422..3c8e9879b2 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -204,7 +204,7 @@ if (APPLE)
   target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
 
   # setup install of OS X interface bundle
-  install(TARGETS ${TARGET_NAME} BUNDLE DESTINATION bin COMPONENT ${APP_COMPONENT})
+  install(TARGETS ${TARGET_NAME} BUNDLE DESTINATION bin COMPONENT ${CLIENT_COMPONENT})
 else (APPLE)
   # copy the resources files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@@ -217,7 +217,7 @@ else (APPLE)
   )
 
   # setup install of interface target
-  install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin COMPONENT ${APP_COMPONENT})
+  install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin COMPONENT ${CLIENT_COMPONENT})
 
   # link target to external libraries
   if (WIN32)