diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index f5cd2a62..160fff7f 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -261,7 +261,7 @@ jobs:
         if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
         uses: actions/upload-artifact@v3
         with:
-          name: sunshine-windows-installer
+          name: sunshine-windows-standalone
           path: artifacts/sunshine-windows-standalone.zip
 
   release:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f34a86b0..cfe45eca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -479,6 +479,7 @@ if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.h
 
 	set(CPACK_PACKAGE_ICON  "${CMAKE_CURRENT_SOURCE_DIR}\\\\sunshine.ico")
 	set(CPACK_NSIS_INSTALLED_ICON_NAME  "${PROJECT__DIR}\\\\${PROJECT_EXE}")
+	set(CPACK_PACKAGE_INSTALL_DIRECTORY "Sunshine") # The name of the directory that will be created in C:/Program files/
 	string(APPEND CPACK_NSIS_DEFINES "\n  RequestExecutionLevel admin") # TODO: Not sure if this is needed but it took me a while to figure out where to put this option so I'm leaving it here
 
 	# Sets permissions on the installed folder so that we can write in it