diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index 184f9f3c3f..725b4272c5 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -6242,7 +6242,7 @@ if (sys.platform == "win32"):
             sys.exit("No such directory "+PPGAME)
         if (os.path.exists(os.path.join(PPGAME,PPGAME+".py"))==0):
             sys.exit("No such file "+PPGAME+"/"+PPGAME+".py")
-        MakeInstaller(PPGAME+"-"+VERSION+".exe", PPGAME+" "+VERSION, PPGAME+" "+VERSION,
+        MakeInstaller(PPGAME+"-"+VERSION+".exe", PPGAME, PPGAME+" "+VERSION,
                       PPGAME+" "+VERSION, "C:\\"+PPGAME+"-"+VERSION, PPGAME)
 
 
diff --git a/doc/makepanda/panda.nsi b/doc/makepanda/panda.nsi
index 7f6c036ab6..8c9c1000dd 100755
--- a/doc/makepanda/panda.nsi
+++ b/doc/makepanda/panda.nsi
@@ -51,7 +51,7 @@ InstType "Typical"
 
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 
-Section "${FULLNAME}" SecCore
+Section "${SMDIRECTORY}" SecCore
         SectionIn 1 2 3 RO
 
         SetOutPath $INSTDIR
@@ -82,7 +82,7 @@ Section "${FULLNAME}" SecCore
             SetOutpath $INSTDIR\${PPGAME}
             File /r ${PSOURCE}\${PPGAME}\*
             SetOutPath $INSTDIR\${PPGAME}
-            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\${FULLNAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPGAME}.py" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "${FULLNAME}"
+            CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Play ${FULLNAME}.lnk" "$INSTDIR\bin\ppython.exe" "${PPGAME}.py" "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Play ${FULLNAME}"
 
         !else
 
@@ -153,7 +153,7 @@ Section -post
         DetailPrint "Adding the uninstaller ..."
         Delete "$INSTDIR\uninst.exe"
         WriteUninstaller "$INSTDIR\uninst.exe"
-        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALLKEY}" "DisplayName" "${FULLNAME}"
+        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALLKEY}" "DisplayName" "${SMDIRECTORY}"
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALLKEY}" "UninstallString" '"$INSTDIR\uninst.exe"'
         CreateShortcut "$SMPROGRAMS\${SMDIRECTORY}\Uninstall ${FULLNAME}.lnk" "$INSTDIR\uninst.exe" ""
 SectionEnd
@@ -168,7 +168,7 @@ SectionEnd
 Section Uninstall
 
 !ifndef PPGAME
-        DetailPrint "Removing ${FULLNAME} from PATH ..."
+        DetailPrint "Removing ${SMDIRECTORY} from PATH ..."
         Push "$INSTDIR\bin"
         Call un.RemoveFromPath
 !endif