diff --git a/dist/info/glupen64_libretro.info b/dist/info/glupen64_libretro.info
deleted file mode 100644
index 92c06998..00000000
--- a/dist/info/glupen64_libretro.info
+++ /dev/null
@@ -1,12 +0,0 @@
-display_name = "Nintendo 64 (GLupeN64)"
-authors = "Hacktarux|Mupen64Plus Team|loganmc10"
-supported_extensions = "n64|v64|z64|bin|u1|ndd"
-corename = "GLupeN64 OpenGL"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo 64"
-database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
-license = "GPLv2"
-permissions = "dynarec_optional"
-display_version = "2.5"
-supports_no_game = "false"
diff --git a/dist/info/glupen64_gles3_libretro.info b/dist/info/mupen64plus_gles3_libretro.info
similarity index 71%
rename from dist/info/glupen64_gles3_libretro.info
rename to dist/info/mupen64plus_gles3_libretro.info
index c31a03d5..468c72cd 100644
--- a/dist/info/glupen64_gles3_libretro.info
+++ b/dist/info/mupen64plus_gles3_libretro.info
@@ -1,7 +1,7 @@
-display_name = "Nintendo 64 (GLupeN64 GLES3)"
-authors = "Hacktarux|Mupen64Plus Team|loganmc10"
+display_name = "Nintendo 64 (Mupen64Plus GLES3)"
+authors = "Hacktarux|Mupen64Plus Team"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
-corename = "GLupeN64"
+corename = "Mupen64Plus"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info
index e1ca9dcf..189dbd66 100644
--- a/dist/info/mupen64plus_libretro.info
+++ b/dist/info/mupen64plus_libretro.info
@@ -1,17 +1,12 @@
 display_name = "Nintendo 64 (Mupen64Plus)"
 authors = "Hacktarux|Mupen64Plus Team"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
-corename = "Mupen64Plus"
+corename = "Mupen64Plus OpenGL"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
-display_version = "2.0-rc2"
+display_version = "2.5"
 supports_no_game = "false"
-firmware_count = 1
-firmware0_desc = "64DD_IPL.bin (64DD IPL ROM)"
-firmware0_path = "64DD_IPL.bin"
-firmware0_opt = "true"
-notes = "(!) 64DD_IPL.bin (md5): 8d3d9f294b6e174bc7b1d2fd1c727530"
diff --git a/dist/info/parallel_libretro.info b/dist/info/parallel_libretro.info
deleted file mode 100644
index 00383b57..00000000
--- a/dist/info/parallel_libretro.info
+++ /dev/null
@@ -1,12 +0,0 @@
-display_name = "Nintendo 64 (ParaLLEl)"
-authors = "Hacktarux|Mupen64Plus Team|TinTiger|Libretro"
-supported_extensions = "n64|v64|z64|bin|u1|ndd"
-corename = "ParaLLEl"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo 64"
-database = "Nintendo - Nintendo 64"
-license = "GPLv2"
-permissions = "dynarec_optional"
-display_version = "2.0-rc2"
-supports_no_game = "false"
diff --git a/dist/info/parallel_debug_libretro.info b/dist/info/parallel_n64_debug_libretro.info
similarity index 57%
rename from dist/info/parallel_debug_libretro.info
rename to dist/info/parallel_n64_debug_libretro.info
index 9ccf1316..fe455cba 100644
--- a/dist/info/parallel_debug_libretro.info
+++ b/dist/info/parallel_n64_debug_libretro.info
@@ -5,8 +5,14 @@ corename = "ParaLLEl (Debug)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
-database = "Nintendo - Nintendo 64"
+database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "2.0-rc2"
 supports_no_game = "false"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "64DD_IPL.bin (64DD IPL ROM)"
+firmware0_path = "64DD_IPL.bin"
+firmware0_opt = "true"
+notes = "(!) 64DD_IPL.bin (md5): 8d3d9f294b6e174bc7b1d2fd1c727530"
diff --git a/dist/info/parallel_n64_libretro.info b/dist/info/parallel_n64_libretro.info
new file mode 100644
index 00000000..58508523
--- /dev/null
+++ b/dist/info/parallel_n64_libretro.info
@@ -0,0 +1,17 @@
+display_name = "Nintendo 64 (ParaLLEl N64)"
+authors = "Hacktarux|Mupen64Plus Team|TinyTiger|Libretro"
+supported_extensions = "n64|v64|z64|bin|u1|ndd"
+corename = "ParaLLEl N64"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo 64"
+database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
+license = "GPLv2"
+permissions = "dynarec_optional"
+display_version = "2.0-rc2"
+supports_no_game = "false"
+firmware_count = 1
+firmware0_desc = "64DD_IPL.bin (64DD IPL ROM)"
+firmware0_path = "64DD_IPL.bin"
+firmware0_opt = "true"
+notes = "(!) 64DD_IPL.bin (md5): 8d3d9f294b6e174bc7b1d2fd1c727530"
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 222b504d..ff1e4cf6 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -517,13 +517,13 @@ include_core_tgbdual() {
 libretro_tgbdual_name="TGB Dual"
 libretro_tgbdual_git_url="https://github.com/libretro/tgbdual-libretro.git"
 
-include_core_glupen64() {
-	register_module core "glupen64" -theos_ios -ngc -ps3 -psp1 -wii
+include_core_mupen64plus() {
+	register_module core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii
 }
-libretro_glupen64_name="GLupeN64"
-libretro_glupen64_git_url="https://github.com/libretro/GLupeN64.git"
-libretro_glupen64_build_platform="$FORMAT_COMPILER_TARGET_ALT"
-libretro_glupen64_configure() {
+libretro_mupen64plus_name="Mupen64 Plus"
+libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git"
+libretro_mupen64plus_build_platform="$FORMAT_COMPILER_TARGET_ALT"
+libretro_mupen64plus_configure() {
 	if iscpu_x86_64 $ARCH; then
 		core_build_args="WITH_DYNAREC=x86_64"
 	elif iscpu_x86 $ARCH; then
@@ -533,13 +533,13 @@ libretro_glupen64_configure() {
 	fi
 }
 
-include_core_mupen64plus() {
-	register_module core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii
+include_core_parallel_n64() {
+	register_module core "parallel_n64" -theos_ios -ngc -ps3 -psp1 -wii
 }
-libretro_mupen64plus_name="Mupen64Plus"
-libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git"
-libretro_mupen64plus_build_platform="$FORMAT_COMPILER_TARGET_ALT"
-libretro_mupen64Plus_configure() {
+libretro_parallel_n64_name="Parallel N64"
+libretro_parallel_n64_git_url="https://github.com/libretro/parallel-n64.git"
+libretro_parallel_n64_build_platform="$FORMAT_COMPILER_TARGET_ALT"
+libretro_parallel_n64_configure() {
 	if iscpu_x86_64 $ARCH; then
 		core_build_args="WITH_DYNAREC=x86_64"
 	elif iscpu_x86 $ARCH; then