diff --git a/functions.sh b/functions.sh
index 99b6f82e..fdaa12f0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1394,17 +1394,17 @@ prepare_emulator() {
         set_setting_value "$dolphinconf" "ISOPath1" "$roms_folder/gc" "dolphin" "General"
         set_setting_value "$dolphinconf" "WiiSDCardPath" "$saves_folder/wii/dolphin/sd.raw" "dolphin" "General"
       fi # Shared actions
-      dir_prep "$saves_folder/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR" # TODO: Multi-user one-off
-      dir_prep "$saves_folder/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA" # TODO: Multi-user one-off
-      dir_prep "$saves_folder/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP" # TODO: Multi-user one-off
+      dir_prep "$saves_folder/gc/dolphin/EU" "/var/data/dolphin-emu/GC/EUR" # TODO: Multi-user one-off
+      dir_prep "$saves_folder/gc/dolphin/US" "/var/data/dolphin-emu/GC/USA" # TODO: Multi-user one-off
+      dir_prep "$saves_folder/gc/dolphin/JP" "/var/data/dolphin-emu/GC/JAP" # TODO: Multi-user one-off
       dir_prep "$screenshots_folder" "/var/data/dolphin-emu/ScreenShots"
       dir_prep "$states_folder/dolphin" "/var/data/dolphin-emu/StateSaves"
       dir_prep "$saves_folder/wii/dolphin" "/var/data/dolphin-emu/Wii" 
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
-      dir_prep "$saves_folder/gc/dolphin/EUR" "/var/data/dolphin-emu/GC/EUR"
-      dir_prep "$saves_folder/gc/dolphin/USA" "/var/data/dolphin-emu/GC/USA"
-      dir_prep "$saves_folder/gc/dolphin/JAP" "/var/data/dolphin-emu/GC/JAP"
+      dir_prep "$saves_folder/gc/dolphin/EU" "/var/data/dolphin-emu/GC/EUR"
+      dir_prep "$saves_folder/gc/dolphin/US" "/var/data/dolphin-emu/GC/USA"
+      dir_prep "$saves_folder/gc/dolphin/JP" "/var/data/dolphin-emu/GC/JAP"
       dir_prep "$screenshots_folder" "/var/data/dolphin-emu/ScreenShots"
       dir_prep "$states_folder/dolphin" "/var/data/dolphin-emu/StateSaves"
       dir_prep "$saves_folder/wii/dolphin" "/var/data/dolphin-emu/Wii" 
@@ -1578,18 +1578,18 @@ prepare_emulator() {
         set_setting_value "$primehackconf" "ISOPath0" "$roms_folder/gc" "primehack" "General"
       fi
       # Shared actions
-      dir_prep "$saves_folder/gc/primehack/EUR" "/var/data/primehack/GC/EUR"
-      dir_prep "$saves_folder/gc/primehack/USA" "/var/data/primehack/GC/USA"
-      dir_prep "$saves_folder/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
+      dir_prep "$saves_folder/gc/primehack/EU" "/var/data/primehack/GC/EUR"
+      dir_prep "$saves_folder/gc/primehack/US" "/var/data/primehack/GC/USA"
+      dir_prep "$saves_folder/gc/primehack/JP" "/var/data/primehack/GC/JAP"
       dir_prep "$screenshots_folder" "/var/data/primehack/ScreenShots"
       dir_prep "$states_folder/primehack" "/var/data/primehack/StateSaves"
       mkdir -pv /var/data/primehack/Wii/
       dir_prep "$saves_folder/wii/primehack" "/var/data/primehack/Wii"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
-      dir_prep "$saves_folder/gc/primehack/EUR" "/var/data/primehack/GC/EUR"
-      dir_prep "$saves_folder/gc/primehack/USA" "/var/data/primehack/GC/USA"
-      dir_prep "$saves_folder/gc/primehack/JAP" "/var/data/primehack/GC/JAP"
+      dir_prep "$saves_folder/gc/primehack/EU" "/var/data/primehack/GC/EUR"
+      dir_prep "$saves_folder/gc/primehack/US" "/var/data/primehack/GC/USA"
+      dir_prep "$saves_folder/gc/primehack/JP" "/var/data/primehack/GC/JAP"
       dir_prep "$screenshots_folder" "/var/data/primehack/ScreenShots"
       dir_prep "$states_folder/primehack" "/var/data/primehack/StateSaves"
       dir_prep "$saves_folder/wii/primehack" "/var/data/primehack/Wii/"
diff --git a/post_update.sh b/post_update.sh
index dfc233be..1f31d975 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -77,6 +77,7 @@ post_update() {
     # - Disable ESDE update checks for existing installs
     # - Move Duckstation saves and states to new locations
     # - Clean up legacy tools files (Configurator is now accessible through the main ES-DE menu)
+    # - Move Dolphin and Primehack save folder names
     # - Offer user option of installing custom controller config
 
     mkdir -p "$mods_folder"
@@ -133,6 +134,19 @@ post_update() {
     rm -rf /var/config/retrodeck/tools
     rm -rf /var/config/emulationstation/.emulationstation/gamelists/tools/
 
+    mv "$saves_folder/gc/dolphin/EUR" "$saves_folder/gc/dolphin/EU"
+    mv "$saves_folder/gc/dolphin/USA" "$saves_folder/gc/dolphin/US"
+    mv "$saves_folder/gc/dolphin/JAP" "$saves_folder/gc/dolphin/JP"
+    dir_prep "$saves_folder/gc/dolphin/EU" "/var/data/dolphin-emu/GC/EUR"
+    dir_prep "$saves_folder/gc/dolphin/US" "/var/data/dolphin-emu/GC/USA"
+    dir_prep "$saves_folder/gc/dolphin/JP" "/var/data/dolphin-emu/GC/JAP"
+    mv "$saves_folder/gc/primehack/EUR" "$saves_folder/gc/primehack/EU"
+    mv "$saves_folder/gc/primehack/USA" "$saves_folder/gc/primehack/US"
+    mv "$saves_folder/gc/primehack/JAP" "$saves_folder/gc/primehack/JP"
+    dir_prep "$saves_folder/gc/primehack/EU" "/var/data/primehack/GC/EUR"
+    dir_prep "$saves_folder/gc/primehack/US" "/var/data/primehack/GC/USA"
+    dir_prep "$saves_folder/gc/primehack/JP" "/var/data/primehack/GC/JAP"
+
     configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "As part of this update, we are offering a new official RetroDECK controller profile!\nIt is an optional component that helps you get the most out of RetroDECK with a new in-game radial menu for unified hotkeys across emulators.\n\nThe files need to be installed outside of the normal ~/retrodeck folder, so we wanted your permission before proceeding.\nIf you decide to not install the profile now, it can always be done later through the Configurator.\n\nThe files will be installed at the following shared Steam locations:\n\n$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/\n$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
     if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then
       install_retrodeck_controller_profile