diff --git a/recipes/android/cores-android-cross b/recipes/android/cores-android-cross
index 2a82d64f..3b0c4634 100644
--- a/recipes/android/cores-android-cross
+++ b/recipes/android/cores-android-cross
@@ -1,32 +1,32 @@
-81 libretro-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
-81 libretro-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
-81 libretro-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build android_arm64-v8a 
-81 libretro-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
-emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=chip8 
-emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=chip8 
-emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro android_arm64-v8a MACHINE=chip8 
-emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=chip8 
-emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=gb 
-emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=gb 
-emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro android_arm64-v8a MACHINE=gb 
-emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=gb 
-emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=nes 
-emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=nes 
-emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro android_arm64-v8a MACHINE=nes 
-emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=nes 
-emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=sms 
-emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=sms 
-emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro android_arm64-v8a MACHINE=sms 
-emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=sms 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build android_arm64-v8a 
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
-gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
-gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
-gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build android_arm64-v8a 
-gw libretro-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
-mgba libretro-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build armeabi
-mgba libretro-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build armeabi-v7a 
-mgba libretro-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build android_arm64-v8a 
-mgba libretro-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build x86
+81 libretro64-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
+81 libretro64-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
+81 libretro64-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build arm64-v8a 
+81 libretro64-81 https://github.com/libretro/81-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
+emux_chip8 libretro64-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=chip8 
+emux_chip8 libretro64-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=chip8 
+emux_chip8 libretro64-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro arm64-v8a MACHINE=chip8 
+emux_chip8 libretro64-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=chip8 
+emux_gb libretro64-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=gb 
+emux_gb libretro64-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=gb 
+emux_gb libretro64-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro arm64-v8a MACHINE=gb 
+emux_gb libretro64-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=gb 
+emux_nes libretro64-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=nes 
+emux_nes libretro64-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=nes 
+emux_nes libretro64-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro arm64-v8a MACHINE=nes 
+emux_nes libretro64-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=nes 
+emux_sms libretro64-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi MACHINE=sms 
+emux_sms libretro64-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro armeabi-v7a MACHINE=sms 
+emux_sms libretro64-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro arm64-v8a MACHINE=sms 
+emux_sms libretro64-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro x86 MACHINE=sms 
+fuse libretro64-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
+fuse libretro64-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
+fuse libretro64-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build arm64-v8a 
+fuse libretro64-fuse https://github.com/libretro/fuse-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
+gw libretro64-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi 
+gw libretro64-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build armeabi-v7a 
+gw libretro64-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build arm64-v8a 
+gw libretro64-gw https://github.com/libretro/gw-libretro.git master PROJECT YES LEIRADEL Makefile build x86 
+mgba libretro64-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build armeabi
+mgba libretro64-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build armeabi-v7a 
+mgba libretro64-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build arm64-v8a 
+mgba libretro64-mgba https://github.com/libretro/mgba.git master PROJECT YES LEIRADEL Makefile libretro-build x86