diff --git a/recipes/android/cores-ndk b/recipes/android/cores-ndk
index 9b97aff3..e7b27dbf 100644
--- a/recipes/android/cores-ndk
+++ b/recipes/android/cores-ndk
@@ -20,7 +20,7 @@ mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-lib
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
diff --git a/recipes/blackberry/cores b/recipes/blackberry/cores
index 5e62114f..98f1de52 100644
--- a/recipes/blackberry/cores
+++ b/recipes/blackberry/cores
@@ -27,7 +27,7 @@ mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-lib
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/linux/cores-x86_64 b/recipes/linux/cores-x86_64
index cbf5440e..0ecd0585 100644
--- a/recipes/linux/cores-x86_64
+++ b/recipes/linux/cores-x86_64
@@ -32,7 +32,7 @@ mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-lib
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . 
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . 
diff --git a/recipes/windows/cores-mingw-w32-sjlj b/recipes/windows/cores-mingw-w32-sjlj
index d4774524..a22a1f92 100644
--- a/recipes/windows/cores-mingw-w32-sjlj
+++ b/recipes/windows/cores-mingw-w32-sjlj
@@ -5,7 +5,7 @@ mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-lib
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile .
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile .
 beetle_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile .
@@ -15,4 +15,4 @@ prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT
 mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . PTR64=0
 mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PTR64=0 PARTIAL=0 
 mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PTR64=0 PARTIAL=1 
-ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=0 PARTIAL=1 
\ No newline at end of file
+ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PTR64=0 PARTIAL=1 
diff --git a/recipes/windows/cores-mingw-w64-seh b/recipes/windows/cores-mingw-w64-seh
index 65906583..2fb32fbe 100644
--- a/recipes/windows/cores-mingw-w64-seh
+++ b/recipes/windows/cores-mingw-w64-seh
@@ -36,7 +36,7 @@ mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-lib
 mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile .
-mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile .
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile .
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile .
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 0d3b9dd3..46038ce5 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -179,8 +179,8 @@ libretro_mednafen_supergrafx_name="Mednafen/Beetle SuperGrafx"
 libretro_mednafen_supergrafx_git_url="https://github.com/libretro/beetle-supergrafx-libretro.git"
 
 register_module core "mednafen_psx" -theos_ios -ngc -psp1
-libretro_mednafen_psx_name="Mednafen PSX"
-libretro_mednafen_psx_git_url="https://github.com/libretro/mednafen-psx-libretro.git"
+libretro_mednafen_psx_name="Mednafen/Beetle PSX"
+libretro_mednafen_psx_git_url="https://github.com/libretro/beetle-psx-libretro.git"
 
 register_module core "mednafen_pcfx" -theos_ios
 libretro_mednafen_pcfx_name="Mednafen/Beetle PC-FX"