diff --git a/.github/scripts/package-macOS.sh b/.github/scripts/package-macOS.sh
index dfb1d9b1a..18f988915 100755
--- a/.github/scripts/package-macOS.sh
+++ b/.github/scripts/package-macOS.sh
@@ -155,7 +155,7 @@ rm -r $PKG_DIR
 if [ -z "$AC_USERNAME" ]; then
     echo "No user name, skipping sign/notarize"
     # pretend that we signed the package and bail out
-    mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
+    mv ${PRODUCT_NAME}.pkg $1
     exit 0
 fi
 
diff --git a/Source/Heavy/DPFExporter.h b/Source/Heavy/DPFExporter.h
index 499daa857..bef84c238 100644
--- a/Source/Heavy/DPFExporter.h
+++ b/Source/Heavy/DPFExporter.h
@@ -278,20 +278,27 @@ class DPFExporter : public ExporterBase {
                 outputFile.getChildFile("bin").getChildFile(name + ".lv2").copyDirectoryTo(outputFile.getChildFile(name + ".lv2"));
             if (vst3)
                 outputFile.getChildFile("bin").getChildFile(name + ".vst3").copyDirectoryTo(outputFile.getChildFile(name + ".vst3"));
-#if JUCE_WINDOWS
             if (vst2)
+#if JUCE_WINDOWS
                 outputFile.getChildFile("bin").getChildFile(name + "-vst.dll").moveFileTo(outputFile.getChildFile(name + "-vst.dll"));
 #elif JUCE_LINUX
-            if (vst2)
                 outputFile.getChildFile("bin").getChildFile(name + "-vst.so").moveFileTo(outputFile.getChildFile(name + "-vst.so"));
 #elif JUCE_MAC
-            if (vst2)
                 outputFile.getChildFile("bin").getChildFile(name + ".vst").copyDirectoryTo(outputFile.getChildFile(name + ".vst"));
 #endif
             if (clap)
                 outputFile.getChildFile("bin").getChildFile(name + ".clap").moveFileTo(outputFile.getChildFile(name + ".clap"));
             if (jack)
+#if JUCE_MAC
+                if (exportType == 2)
+                    outputFile.getChildFile("bin").getChildFile(name + ".app").moveFileTo(outputFile.getChildFile(name + ".app"));
+                else
+                    outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name));
+#elif JUCE_WINDOWS
+                outputFile.getChildFile("bin").getChildFile(name + ".exe").moveFileTo(outputFile.getChildFile(name + ".exe"));
+#else
                 outputFile.getChildFile("bin").getChildFile(name).moveFileTo(outputFile.getChildFile(name));
+#endif
 
             bool compilationExitCode = getExitCode();