diff --git a/.releaseindex.json b/.releaseindex.json
index c8d02388..acb9c6fc 100644
--- a/.releaseindex.json
+++ b/.releaseindex.json
@@ -1,8 +1,8 @@
 {
   "WindowsClassic":      "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-classic\\.zip",
   "WindowsAvalonia":     "Libation\\.\\d+\\.\\d+\\.\\d+-win(dows)?-chardonnay\\.zip",
-  "LinuxAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-amd64\\.deb",
-  "MacOSAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-x64\\.tgz",
-  "LinuxAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-arm64\\.deb",
-  "MacOSAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-arm64\\.tgz"
+  "LinuxAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-amd64\\.deb",
+  "MacOSAvalonia":       "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-x64\\.tgz",
+  "LinuxAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay-arm64\\.deb",
+  "MacOSAvalonia_Arm64": "Libation\\.\\d+\\.\\d+\\.\\d+-macOS-chardonnay-arm64\\.tgz"
 }
diff --git a/Scripts/Bundle_Linux.sh b/Scripts/Bundle_Linux.sh
index 33d71afb..a5f842ef 100644
--- a/Scripts/Bundle_Linux.sh
+++ b/Scripts/Bundle_Linux.sh
@@ -139,7 +139,7 @@ echo "Changing permissions for pre- and post-install files..."
 chmod +x "$FOLDER_DEBIAN/preinst"
 chmod +x "$FOLDER_DEBIAN/postinst"
 
-DEB_FILE="Libation.${VERSION}-linux-${ARCH}.deb"
+DEB_FILE=Libation.${VERSION}-linux-chardonnay-${ARCH}.deb
 echo "Creating $DEB_FILE"
 dpkg-deb -Zxz --build $DEB_DIR ./$DEB_FILE
 
diff --git a/Scripts/Bundle_MacOS.sh b/Scripts/Bundle_MacOS.sh
index 7465cc13..cb837dd1 100644
--- a/Scripts/Bundle_MacOS.sh
+++ b/Scripts/Bundle_MacOS.sh
@@ -94,7 +94,7 @@ do
   rm $BUNDLE_MACOS/$n
 done
 
-APP_FILE=Libation.${VERSION}-macOS-${ARCH}.tgz
+APP_FILE=Libation.${VERSION}-chardonnay-macOS-${ARCH}.tgz
 
 echo "Creating app bundle: $APP_FILE"
 tar -czvf $APP_FILE $BUNDLE
diff --git a/Source/LibationAvalonia/Program.cs b/Source/LibationAvalonia/Program.cs
index 3aecb91f..6481df23 100644
--- a/Source/LibationAvalonia/Program.cs
+++ b/Source/LibationAvalonia/Program.cs
@@ -2,8 +2,6 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ApplicationServices;
 using AppScaffolding;