diff --git a/dist-scripts/ngc-cores.sh b/dist-scripts/ngc-cores.sh
index 62b3139774..2355f8f4c0 100755
--- a/dist-scripts/ngc-cores.sh
+++ b/dist-scripts/ngc-cores.sh
@@ -14,6 +14,6 @@ for f in *_ngc.a ; do
    fi
    cp -f "$f" ../libretro_ngc.a
    make -C ../ -f Makefile.ngc $whole_archive $big_stack -j3 || exit 1
-   mv -f ../retroarch_ngc.dol ../ngc/pkg/$name.dol
+   mv -f ../retroarch_ngc.dol ../ngc/pkg/${name}_libretro_ngc.dol
    rm -f ../retroarch_ngc.dol ../retroarch_ngc.elf ../retroarch_ngc.elf.map
 done
diff --git a/dist-scripts/ps3-cores-cex-355.sh b/dist-scripts/ps3-cores-cex-355.sh
index f42ac36554..00bdb4561b 100755
--- a/dist-scripts/ps3-cores-cex-355.sh
+++ b/dist-scripts/ps3-cores-cex-355.sh
@@ -20,7 +20,7 @@ for f in *_ps3.a ; do
    cp -f "$f" ../libretro_ps3.a
    make -C ../ -f Makefile.ps3 $whole_archive -j3 || exit 1
    make_self_wc ../retroarch_ps3.elf ../CORE.SELF
-   mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"$name.SELF"
+   mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"${name}_libretro_ps3.SELF"
    rm -f ../retroarch_ps3.elf ../retroarch_ps3.self ../CORE.SELF
 done
 
diff --git a/dist-scripts/ps3-cores-dex.sh b/dist-scripts/ps3-cores-dex.sh
index b787172f81..351e381a0d 100755
--- a/dist-scripts/ps3-cores-dex.sh
+++ b/dist-scripts/ps3-cores-dex.sh
@@ -21,7 +21,7 @@ for f in *_ps3.a ; do
    cp -f "$f" ../libretro_ps3.a
    make -C ../ -f Makefile.ps3 $whole_archive -j3 || exit 1
    $MAKE_FSELF_NPDRM ../retroarch_ps3.elf ../CORE.SELF
-   mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"$name.SELF"
+   mv -f ../CORE.SELF ../ps3/pkg/USRDIR/cores/"${name}_libretro_ps3.SELF"
    rm -f ../retroarch_ps3.elf ../retroarch_ps3.self ../CORE.SELF
 done
 
diff --git a/dist-scripts/wii-cores.sh b/dist-scripts/wii-cores.sh
index 0d90919069..c3fc6bfc08 100755
--- a/dist-scripts/wii-cores.sh
+++ b/dist-scripts/wii-cores.sh
@@ -18,6 +18,6 @@ for f in *_wii.a ; do
    fi
    cp -f "$f" ../libretro_wii.a
    make -C ../ -f Makefile.wii $whole_archive $big_stack -j3 || exit 1
-   mv -f ../retroarch_wii.dol ../wii/pkg/$name.dol
+   mv -f ../retroarch_wii.dol ../wii/pkg/${name}_libretro_wii.dol
    rm -f ../retroarch_wii.dol ../retroarch_wii.elf ../retroarch_wii.elf.map
 done
diff --git a/dist-scripts/xdk1-cores.sh b/dist-scripts/xdk1-cores.sh
index 9f15abff96..312e665848 100644
--- a/dist-scripts/xdk1-cores.sh
+++ b/dist-scripts/xdk1-cores.sh
@@ -16,9 +16,9 @@ for f in *_xdk.lib ; do
    echo $name
    if [ $name = "tyrquake" ] || [ $name = "genesis_plus_gx" ] ; then
    	cp -f "$f" ../msvc/RetroArch-Xbox1/Release_LTCG_BigStack/libretro_xdk.lib
-   	cmd.exe /k xdk1_env_bigstack.bat $name
+   	cmd.exe /k xdk1_env_bigstack.bat ${name}_libretro_xdk1
    else
    	cp -f "$f" ../msvc/RetroArch-Xbox1/Release_LTCG/libretro_xdk.lib
-   	cmd.exe /k xdk1_env.bat $name
+   	cmd.exe /k xdk1_env.bat ${name}_libretro_xdk1
    fi
 done
diff --git a/dist-scripts/xdk360-cores.sh b/dist-scripts/xdk360-cores.sh
index a9920f8648..ade310fd3a 100644
--- a/dist-scripts/xdk360-cores.sh
+++ b/dist-scripts/xdk360-cores.sh
@@ -13,5 +13,5 @@ for f in *_xdk360.lib ; do
    name=`echo "$f" | sed 's/\(_libretro\|\)_xdk360.lib$//'`
    echo $name
    cp -f "$f" ../msvc/RetroArch-360/Release_LTCG/libretro_xdk360.lib
-   cmd.exe /k xdk360_env.bat $name
+   cmd.exe /k xdk360_env.bat ${name}_libretro_xdk360
 done