diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e6365c8c..ca3e381405 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,8 +239,10 @@ if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
     build-package ALL
     DEPENDS interface assignment-client domain-server stack-manager
     COMMAND set INSTALLER_SOURCE_DIR=${CMAKE_BINARY_DIR}/full-stack-deployment
-    COMMAND set INSTALLER_NAME=${CMAKE_BINARY_DIR}/this-is-a-test.exe
-    COMMANE set INSTALLER_SCRIPTS_DIR=${CMAKE_SOURCE_DIR}/examples
+    COMMAND set INSTALLER_NAME=${CMAKE_BINARY_DIR}/${INSTALLER_NAME}
+    COMMAND set INSTALLER_SCRIPTS_DIR=${CMAKE_SOURCE_DIR}/examples
+    COMMAND set INSTALLER_COMPANY=${INSTALLER_COMPANY}
+    COMMAND set INSTALLER_DIRECTORY=${INSTALLER_DIRECTORY}
     COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi"
   )
 endif ()
\ No newline at end of file
diff --git a/cmake/macros/IncludeApplicationVersion.cmake b/cmake/macros/IncludeApplicationVersion.cmake
index a91aad6acc..753a12a01c 100644
--- a/cmake/macros/IncludeApplicationVersion.cmake
+++ b/cmake/macros/IncludeApplicationVersion.cmake
@@ -14,13 +14,22 @@ macro(INCLUDE_APPLICATION_VERSION)
   # We are relying on Jenkins defined environment variables to determine the origin of this build
   # and will only package if this is a PR or Release build
   if (DEFINED ENV{JOB_ID})
-    set (DEPLOY_PACKAGE 1)
-    set (BUILD_SEQ $ENV{JOB_ID})
+    set(DEPLOY_PACKAGE 1)
+    set(BUILD_SEQ $ENV{JOB_ID})
+    set(INSTALLER_COMPANY "High Fidelity")
+    set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
+    set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
   elseif (DEFINED ENV{ghprbPullId})
-    set (DEPLOY_PACKAGE 1)
-    set (BUILD_SEQ "PR-$ENV{ghprbPullId}")
+    set(DEPLOY_PACKAGE 1)
+    set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
+    set(INSTALLER_COMPANY "High Fidelity - PR")
+    set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
+    set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
   else ()
     set(BUILD_SEQ "dev")
+    set(INSTALLER_COMPANY "High Fidelity - Dev")
+    set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
+    set(INSTALLER_NAME "dev-interface-win64.exe")
   endif ()
   configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${PROJECT_BINARY_DIR}/includes/ApplicationVersion.h")
   include_directories("${PROJECT_BINARY_DIR}/includes")
diff --git a/tools/nsis/release.nsi b/tools/nsis/release.nsi
index 86ea055e6b..9bc75e5274 100644
--- a/tools/nsis/release.nsi
+++ b/tools/nsis/release.nsi
@@ -1,18 +1,19 @@
 !include LogicLib.nsh
 !include x64.nsh
 
-!define srcdir $%INSTALLER_SOURCE_DIR%
-!define setup $%INSTALLER_NAME%
-!define scriptsdir $%INSTALLER_SCRIPTS_DIR%
-!define company $%INSTALLER_COMPANY%
+!define srcdir "$%INSTALLER_SOURCE_DIR%"
+!define setup "$%INSTALLER_NAME%"
+!define scriptsdir "$%INSTALLER_SCRIPTS_DIR%"
+!define company "$%INSTALLER_COMPANY%"
+!define install_directory "$%INSTALLER_DIRECTORY%"
 !define interface_exec "interface.exe"
 !define stack_manager_exec "stack-manager.exe"
 !define interface_icon "interface.ico"
 !define stack_manager_icon "stack-manager.ico"
 !define regkey "Software\${company}"
 !define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\${company}"
-!define install_dir_company "$PROGRAMFILES64\${company}"
-!define startmenu_company "$SMPROGRAMS\${company}"
+!define install_dir_company "$PROGRAMFILES64\${install_directory}"
+!define startmenu_company "$SMPROGRAMS\${install_directory}"
 !define uninstaller "uninstall.exe"
 
 ;--------------------------------