diff --git a/installer_scripts/env.cfg b/installer_scripts/env.cfg
index dc5fcefd151993802229ba4b32f2be6d2c1043b0..5c7662c055ff86d949d619f9eec1fb64c6696026 100644
--- a/installer_scripts/env.cfg
+++ b/installer_scripts/env.cfg
@@ -157,31 +157,31 @@ WHONIX_URL_TOR="http://download.w5j6stm77zs6652pgsij4awcjeel3eco7kvipheu6mtr623e
 WHONIX_VERSION="17.0.3.0"
 WHONIX_ARCHIVE="Whonix-XFCE-$WHONIX_VERSION.Intel_AMD64.qcow2.libvirt.xz"
 WHONIX_ARCHIVE_SIGNED="$WHONIX_ARCHIVE.asc"
-WHONIX_SHA512="Whonix-XFCE-$WHONIX_VERSION.Intel_AMD64.qcow2.libvirt.xz.sha512sums"
+WHONIX_SHA512="Whonix-Xfce-$WHONIX_VERSION.Intel_AMD64.qcow2.libvirt.xz.sha512sums"
 WHONIX_SHA512_SIGNED="$WHONIX_SHA512.asc"
 WHONIX_FILES_TO_DOWNLOAD=("$WHONIX_ARCHIVE" "$WHONIX_ARCHIVE_SIGNED" "$WHONIX_SHA512" "$WHONIX_SHA512_SIGNED")
 
 # Names of Whonix files within the archive.
 WHONIX_EXTERNAL_NETWORK="Whonix_external_network-$WHONIX_VERSION.xml"
 WHONIX_INTERNAL_NETWORK="Whonix_internal_network-$WHONIX_VERSION.xml"
-WHONIX_GATEWAY_XML="Whonix-Gateway-XFCE-$WHONIX_VERSION.xml"
-WHONIX_WORKSTATION_XML="Whonix-Workstation-XFCE-$WHONIX_VERSION.xml"
-WHONIX_GATEWAY_QCOW2="Whonix-Gateway-XFCE-$WHONIX_VERSION.Intel_AMD64.qcow2"
-WHONIX_WORKSTATION_QCOW2="Whonix-Workstation-XFCE-$WHONIX_VERSION.Intel_AMD64.qcow2"
+WHONIX_GATEWAY_XML="Whonix-Gateway-Xfce-$WHONIX_VERSION.xml"
+WHONIX_WORKSTATION_XML="Whonix-Workstation-Xfce-$WHONIX_VERSION.xml"
+WHONIX_GATEWAY_QCOW2="Whonix-Gateway-Xfce-$WHONIX_VERSION.Intel_AMD64.qcow2"
+WHONIX_WORKSTATION_QCOW2="Whonix-Workstation-Xfce-$WHONIX_VERSION.Intel_AMD64.qcow2"
 
 # Static Variables specific to Kicksecure VM Packages
 KICK_URL_CLEARNET="https://download.kicksecure.com/libvirt/"
 KICK_URL_TOR="http://download.dds6qkxpwdeubwucdiaord2xgbbeyds25rbsgr73tbfpqpt4a6vjwsyd.onion/libvirt/"
 KICKSECURE_VERSION="17.0.3.0"
-KICKSECURE_ARCHIVE="Kicksecure-XFCE-$KICKSECURE_VERSION.Intel_AMD64.qcow2.libvirt.xz"
+KICKSECURE_ARCHIVE="Kicksecure-Xfce-$KICKSECURE_VERSION.Intel_AMD64.qcow2.libvirt.xz"
 KICKSECURE_ARCHIVE_SIGNED="$KICKSECURE_ARCHIVE.asc"
 KICKSECURE_SHA512="Kicksecure-Xfce-$KICKSECURE_VERSION.Intel_AMD64.qcow2.libvirt.xz.sha512sums"
 KICKSECURE_SHA512_SIGNED="$KICKSECURE_SHA512.asc"
 KICKSECURE_FILES_TO_DOWNLOAD=("$KICKSECURE_ARCHIVE" "$KICKSECURE_ARCHIVE_SIGNED" "$KICKSECURE_SHA512" "$KICKSECURE_SHA512_SIGNED")
 
 # Names of Kicksecure files within the archive.
-KICKSECURE_XML="Kicksecure-XFCE-$KICKSECURE_VERSION.xml"
-KICKSECURE_QCOW2="Kicksecure-XFCE-$KICKSECURE_VERSION.Intel_AMD64.qcow2"
+KICKSECURE_XML="Kicksecure-Xfce-$KICKSECURE_VERSION.xml"
+KICKSECURE_QCOW2="Kicksecure-Xfce-$KICKSECURE_VERSION.Intel_AMD64.qcow2"
 
 ##### Hardcoded file paths #####
 BASECONF_DIR="/base_configs"
diff --git a/plague-install b/plague-install
index 48cabd40537cf39da4ba016e2595c70d6b95e69e..6a753a0074b336b7540c883af689ab7aabc56b48 100755
--- a/plague-install
+++ b/plague-install
@@ -650,7 +650,7 @@ custom_repo() {
   msg "\t http://lysator7eknrfl47rlyxvgeamrv7ucefgrrlhk7rouv3sna25asetwid.onion/pub/voidlinux/current/musl"
   msg ""
   msg "${INFORM}Default clearnet repository:"
-  msg "\t https://alpha.de.repo.voidlinux.org/current/musl"
+  msg "\t https://repo-default.voidlinux.org/current/musl"
   msg ""
   prompt "Do you want to enter a custom repository to pull packages from? (y/N): "
   read customRepoAnswer