diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
index c91443a..9cd6d15 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
@@ -121,9 +121,9 @@ Section "Start Menu Shortcuts"
   SetOutPath "$INSTDIR\bin"
 
   SetShellVarContext All
-  CreateDirectory "$SMPROGRAMS\${PK_NAME_FULL}"
-  CreateShortCut "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk" "$INSTDIR\uninstall-${PK_NAME}.exe" "" "$INSTDIR\uninstall-${PK_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_ICON}" 0
+  CreateDirectory "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)"
+  CreateShortCut "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)\Uninstall ${PK_NAME}.lnk" "$INSTDIR\uninstall-${PK_NAME}.exe" "" "$INSTDIR\uninstall-${PK_NAME}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)\${PK_NAME}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_ICON}" 0
 SectionEnd
 
 Section "Desktop Icon"
@@ -157,11 +157,11 @@ Section "Uninstall"
   ; Remove shortcuts, if any
   SetShellVarContext All
   Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)\${PK_NAME}.lnk"
+  Delete "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)\Uninstall ${PK_NAME}.lnk"
 
   ; Remove directories used
-  RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
+  RMDir "$SMPROGRAMS\${PK_NAME} (${PK_ARCH}bit)"
   RMDir "$STUFFDIR"
   RMDir "$INSTDIR"
 
diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
index 1e2e8b7..bdefd1f 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
@@ -54,15 +54,10 @@ pkinstall_release() {
     # copy NSIS configuration
     cp "$FILES_PACKET_DIR/opentoonz.nsi" "./" || return 1
 
-    local LOCAL_OPENTOONZ_NAME_FULL="OpenToonz"
-    if [ "$ARCH" != "64" ]; then
-        LOCAL_OPENTOONZ_NAME_FULL="$LOCAL_OPENTOONZ_NAME_FULL $ARCH"
-    fi
-
     # create config.nsh (see opentoons.nsi)
     cat > config.nsh << EOF
 !define PK_NAME         "OpenToonz" 
-!define PK_NAME_FULL    "${LOCAL_OPENTOONZ_NAME_FULL}"
+!define PK_NAME_FULL    "OpenToonz Morevna Edition (${ARCH}bit)"
 !define PK_ARCH         "${ARCH}"
 !define PK_VERSION      "${LOCAL_VERSION2}"
 !define PK_VERSION_FULL "${LOCAL_VERSION}-${LOCAL_COMMIT:0:5}" 
diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
index 2cab7be..77b1101 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
+++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
@@ -125,10 +125,10 @@ Section "Start Menu Shortcuts"
   SetOutPath "$INSTDIR\bin"
 
   SetShellVarContext All
-  CreateDirectory "$SMPROGRAMS\${PK_DIR_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME}\Uninstall ${PK_NAME_FULL}.lnk" "$INSTDIR\uninstall-${PK_NAME}.exe" "" "$INSTDIR\uninstall-${PK_NAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_ICON}" 0
-  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL} (Debug Console).lnk" "$INSTDIR\${PK_EXECUTABLE}" "--console" "$INSTDIR\${PK_ICON}" 0
+  CreateDirectory "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit"
+  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\Uninstall ${PK_NAME_FULL}.lnk" "$INSTDIR\uninstall-${PK_NAME}.exe" "" "$INSTDIR\uninstall-${PK_NAME}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\${PK_NAME_FULL}.lnk" "$INSTDIR\${PK_EXECUTABLE}" "" "$INSTDIR\${PK_ICON}" 0
+  CreateShortCut "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\${PK_NAME_FULL} (Debug Console).lnk" "$INSTDIR\${PK_EXECUTABLE}" "--console" "$INSTDIR\${PK_ICON}" 0
 SectionEnd
 
 Section "Desktop Icon"
@@ -168,12 +168,12 @@ Section "Uninstall"
   ; Remove shortcuts, if any
   SetShellVarContext All
   Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_DIR_NAME}\Uninstall ${PK_NAME_FULL}.lnk"
-  Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL} (Debug Console).lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\Uninstall ${PK_NAME_FULL}.lnk"
+  Delete "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit\${PK_NAME_FULL} (Debug Console).lnk"
 
   ; Remove directories used
-  RMDir "$SMPROGRAMS\${PK_DIR_NAME}"
+  RMDir "$SMPROGRAMS\${PK_DIR_NAME} ${PK_ARCH}bit"
   RMDir "$INSTDIR"
 
   System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
@@ -204,7 +204,7 @@ oops:
   Return
 
 cancel:
-  MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to uninstall another version of ${PK_NAME_FULL}"
+  MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to uninstall another version of Synfig"
   Abort
 
 ignore:
diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
index 934c2de..da7273c 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
@@ -84,22 +84,12 @@ pkinstall_release() {
 
     # copy NSIS configuration
     cp "$FILES_PACKET_DIR/synfigstudio.nsi" "./" || return 1
-    
-    local LOCAL_SYNFIG_DIR_NAME="Synfig"
-    if [ "$ARCH" != "64" ]; then
-        LOCAL_SYNFIG_DIR_NAME="$LOCAL_SYNFIG_DIR_NAME $ARCH"
-    fi
-
-    local LOCAL_SYNFIG_NAME_FULL="Synfig Studio"
-    if [ "$ARCH" != "64" ]; then
-        LOCAL_SYNFIG_NAME_FULL="$LOCAL_SYNFIG_NAME_FULL $ARCH"
-    fi
 
     # create config.nsh (see opentoons.nsi)
     cat > config.nsh << EOF
 !define PK_NAME          "synfigstudio" 
-!define PK_DIR_NAME      "${LOCAL_SYNFIG_DIR_NAME}" 
-!define PK_NAME_FULL     "${LOCAL_SYNFIG_NAME_FULL}"
+!define PK_DIR_NAME      "Synfig"
+!define PK_NAME_FULL     "Synfig Studio (${ARCH}bit)"
 !define PK_ARCH          "${ARCH}"
 !define PK_VERSION       "${LOCAL_VERSION2}"
 !define PK_VERSION_FULL  "${LOCAL_VERSION}-${LOCAL_COMMIT:0:5}"