diff --git a/dist/info/00_example_libretro.info b/dist/info/00_example_libretro.info
index 5300e1e5..a8a70079 100644
--- a/dist/info/00_example_libretro.info
+++ b/dist/info/00_example_libretro.info
@@ -21,10 +21,9 @@
 # Name of the system that the core targets (optional):
 # systemname = "Nintendo Entertainment System"
 
-# Name of the Discord RPC asset used. This should be set to a platform.
-# Use other core info files as guidance if possible.
-# If blank or not used, a standard core asset will be used (optional):
-# rpcname = "nes"
+# ID of the primary platform the core uses. Use other core info files as guidance if possible.
+# If blank or not used, a standard core platform will be used (optional):
+# systemid = "nes"
 
 # Name of the database that the core supports (optional):
 # database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
diff --git a/dist/info/2048_libretro.info b/dist/info/2048_libretro.info
index d005ba78..bfd30fe4 100644
--- a/dist/info/2048_libretro.info
+++ b/dist/info/2048_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = ""
 corename = "2048"
 categories = "Game"
 systemname = "2048 Game Clone"
-rpcname = "2048"
+systemid = "2048"
 license = "Public Domain"
 permissions = ""
 display_version = "1.0"
diff --git a/dist/info/3dengine_libretro.info b/dist/info/3dengine_libretro.info
index f60221c1..85e39771 100644
--- a/dist/info/3dengine_libretro.info
+++ b/dist/info/3dengine_libretro.info
@@ -5,7 +5,7 @@ corename = "3DEngine"
 manufacturer = "Various"
 categories = "Tech demo"
 systemname = "3D Engine"
-rpcname = "3d_engine"
+systemid = "3d_engine"
 license = "GPLv3"
 permissions = ""
 display_version = "v1"
diff --git a/dist/info/4do_libretro.info b/dist/info/4do_libretro.info
index 94a46f3c..e09554a5 100644
--- a/dist/info/4do_libretro.info
+++ b/dist/info/4do_libretro.info
@@ -5,7 +5,7 @@ corename = "4DO"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "3DO"
-rpcname = "3do"
+systemid = "3do"
 database = "The 3DO Company - 3DO"
 license = "LGPL/Non-commercial"
 permissions = ""
diff --git a/dist/info/81_libretro.info b/dist/info/81_libretro.info
index 69aa78e7..0882b320 100644
--- a/dist/info/81_libretro.info
+++ b/dist/info/81_libretro.info
@@ -5,7 +5,7 @@ corename = "81"
 manufacturer = "Sinclair"
 categories = "Emulator"
 systemname = "ZX81"
-rpcname = "zx81"
+systemid = "zx81"
 database = "Sinclair - ZX 81"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/atari800_libretro.info b/dist/info/atari800_libretro.info
index b4fe4561..979b518c 100644
--- a/dist/info/atari800_libretro.info
+++ b/dist/info/atari800_libretro.info
@@ -5,7 +5,7 @@ corename = "Atari800"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 5200"
-rpcname = "atari_5200"
+systemid = "atari_5200"
 database = "Atari - 5200"
 license = "GPL"
 permissions = ""
diff --git a/dist/info/blastem_libretro.info b/dist/info/blastem_libretro.info
index 192a4f94..26bac449 100644
--- a/dist/info/blastem_libretro.info
+++ b/dist/info/blastem_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "md|bin|smd"
 corename = "BlastEm"
 manufacturer = "Sega"
 categories = "Emulator"
-rpcname = "mega_drive"
+systemid = "mega_drive"
 systemname = "Sega Genesis"
 database = "Sega - Mega Drive - Genesis"
 license = "GPLv3"
diff --git a/dist/info/bluemsx_libretro.info b/dist/info/bluemsx_libretro.info
index 4e603fcf..6700f7dc 100644
--- a/dist/info/bluemsx_libretro.info
+++ b/dist/info/bluemsx_libretro.info
@@ -5,7 +5,7 @@ corename = "blueMSX"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MSX/SVI/ColecoVision/SG-1000"
-rpcname = "msx"
+systemid = "msx"
 database = "Microsoft - MSX|Microsoft - MSX2|Coleco - ColecoVision|Sega - SG-1000"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/bnes_libretro.info b/dist/info/bnes_libretro.info
index 04731138..23457db9 100644
--- a/dist/info/bnes_libretro.info
+++ b/dist/info/bnes_libretro.info
@@ -5,7 +5,7 @@ corename = "bnes/higan"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_accuracy_libretro.info b/dist/info/bsnes_accuracy_libretro.info
index 7c8ac694..e8ceaf64 100644
--- a/dist/info/bsnes_accuracy_libretro.info
+++ b/dist/info/bsnes_accuracy_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes/higan Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_balanced_libretro.info b/dist/info/bsnes_balanced_libretro.info
index 3b0c7fea..f16c811c 100644
--- a/dist/info/bsnes_balanced_libretro.info
+++ b/dist/info/bsnes_balanced_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes/higan Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_cplusplus98_libretro.info b/dist/info/bsnes_cplusplus98_libretro.info
index 709196cd..43bf1175 100644
--- a/dist/info/bsnes_cplusplus98_libretro.info
+++ b/dist/info/bsnes_cplusplus98_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes C++98 (v085)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_mercury_accuracy_libretro.info b/dist/info/bsnes_mercury_accuracy_libretro.info
index 66364a58..86d39be2 100644
--- a/dist/info/bsnes_mercury_accuracy_libretro.info
+++ b/dist/info/bsnes_mercury_accuracy_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes-mercury Accuracy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_mercury_balanced_libretro.info b/dist/info/bsnes_mercury_balanced_libretro.info
index 210cfdd0..3bf063af 100644
--- a/dist/info/bsnes_mercury_balanced_libretro.info
+++ b/dist/info/bsnes_mercury_balanced_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes-mercury Balanced"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_mercury_performance_libretro.info b/dist/info/bsnes_mercury_performance_libretro.info
index 394033c1..32308ea3 100644
--- a/dist/info/bsnes_mercury_performance_libretro.info
+++ b/dist/info/bsnes_mercury_performance_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes-mercury Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/bsnes_performance_libretro.info b/dist/info/bsnes_performance_libretro.info
index 7315bcef..1c1cadf6 100644
--- a/dist/info/bsnes_performance_libretro.info
+++ b/dist/info/bsnes_performance_libretro.info
@@ -5,7 +5,7 @@ corename = "bsnes/higan Performance"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/cap32_libretro.info b/dist/info/cap32_libretro.info
index 596ad677..e78d5e4d 100644
--- a/dist/info/cap32_libretro.info
+++ b/dist/info/cap32_libretro.info
@@ -5,7 +5,7 @@ corename = "Caprice32"
 manufacturer = "Amstrad"
 categories = "Emulator"
 systemname = "CPC"
-rpcname = "cpc"
+systemid = "cpc"
 database = "Amstrad - CPC"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/chailove_libretro.info b/dist/info/chailove_libretro.info
index fde9af64..f45c7844 100644
--- a/dist/info/chailove_libretro.info
+++ b/dist/info/chailove_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "chai|chailove"
 corename = "ChaiLove"
 categories = "Game engine"
 systemname = "ChaiLove"
-rpcname = "chailove"
+systemid = "chailove"
 database = "ChaiLove"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/citra_canary_libretro.info b/dist/info/citra_canary_libretro.info
index 77386487..618994bc 100644
--- a/dist/info/citra_canary_libretro.info
+++ b/dist/info/citra_canary_libretro.info
@@ -5,7 +5,7 @@ corename = "Citra Canary/Experimental"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 3DS"
-rpcname = "3ds"
+systemid = "3ds"
 database = "Nintendo - Nintendo 3DS"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/citra_libretro.info b/dist/info/citra_libretro.info
index e96001c2..2ac40bc1 100644
--- a/dist/info/citra_libretro.info
+++ b/dist/info/citra_libretro.info
@@ -5,7 +5,7 @@ corename = "Citra"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 3DS"
-rpcname = "3ds"
+systemid = "3ds"
 database = "Nintendo - Nintendo 3DS"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/craft_libretro.info b/dist/info/craft_libretro.info
index 87b15296..bdbf4226 100644
--- a/dist/info/craft_libretro.info
+++ b/dist/info/craft_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = ""
 corename = "Craft"
 categories = "Game"
 systemname = "Minecraft Game Clone"
-rpcname = "craft"
+systemid = "craft"
 license = "MIT"
 permissions = ""
 display_version = "v1"
diff --git a/dist/info/crocods_libretro.info b/dist/info/crocods_libretro.info
index bd777fbc..ccf5d891 100644
--- a/dist/info/crocods_libretro.info
+++ b/dist/info/crocods_libretro.info
@@ -5,7 +5,7 @@ corename = "CrocoDS"
 manufacturer = "Amstrad"
 categories = "Emulator"
 systemname = "CPC"
-rpcname = "cpc"
+systemid = "cpc"
 database = "Amstrad - CPC"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/desmume2015_libretro.info b/dist/info/desmume2015_libretro.info
index 186c07fc..ad5f698f 100644
--- a/dist/info/desmume2015_libretro.info
+++ b/dist/info/desmume2015_libretro.info
@@ -5,7 +5,7 @@ corename = "DeSmuME 2015"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
-rpcname = "nds"
+systemid = "nds"
 database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/desmume_libretro.info b/dist/info/desmume_libretro.info
index 058c63a5..2df7aa8e 100644
--- a/dist/info/desmume_libretro.info
+++ b/dist/info/desmume_libretro.info
@@ -5,7 +5,7 @@ corename = "DeSmuME"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
-rpcname = "nds"
+systemid = "nds"
 database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/dinothawr_libretro.info b/dist/info/dinothawr_libretro.info
index 91e34466..5ed91bb4 100644
--- a/dist/info/dinothawr_libretro.info
+++ b/dist/info/dinothawr_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "game"
 corename = "Dinothawr"
 database = "Dinothawr"
 systemname = "Dinothawr Game Engine"
-rpcname = "dinothawr"
+systemid = "dinothawr"
 categories = "Game"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/dolphin_launcher_libretro.info b/dist/info/dolphin_launcher_libretro.info
index a7143905..4018f1d4 100644
--- a/dist/info/dolphin_launcher_libretro.info
+++ b/dist/info/dolphin_launcher_libretro.info
@@ -5,7 +5,7 @@ corename = "Dolphin Launcher"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo GameCube / Wii"
-rpcname = "gamecube"
+systemid = "gamecube"
 database = "Nintendo - Wii|Nintendo - GameCube"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/dolphin_libretro.info b/dist/info/dolphin_libretro.info
index c1f91231..01029788 100644
--- a/dist/info/dolphin_libretro.info
+++ b/dist/info/dolphin_libretro.info
@@ -5,7 +5,7 @@ corename = "Dolphin"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "GameCube / Wii"
-rpcname = "gamecube"
+systemid = "gamecube"
 database = "Nintendo - GameCube|Nintendo - Wii"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/dosbox_libretro.info b/dist/info/dosbox_libretro.info
index 5221baae..e478889a 100644
--- a/dist/info/dosbox_libretro.info
+++ b/dist/info/dosbox_libretro.info
@@ -5,7 +5,7 @@ corename = "DOSBox"
 manufacturer = "Microsoft"
 categories = "Emulator"
 systemname = "DOS"
-rpcname = "dos"
+systemid = "dos"
 database = "DOS"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/dosbox_svn_libretro.info b/dist/info/dosbox_svn_libretro.info
index 4acd3929..7d58479d 100644
--- a/dist/info/dosbox_svn_libretro.info
+++ b/dist/info/dosbox_svn_libretro.info
@@ -5,7 +5,7 @@ corename = "DOSBox-SVN"
 manufacturer = "Microsoft"
 categories = "Emulator"
 systemname = "DOS"
-rpcname = "dos"
+systemid = "dos"
 database = "DOS"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/emux_chip8_libretro.info b/dist/info/emux_chip8_libretro.info
index 5cb50d36..9fa72e8e 100644
--- a/dist/info/emux_chip8_libretro.info
+++ b/dist/info/emux_chip8_libretro.info
@@ -5,7 +5,7 @@ corename = "Emux CHIP-8"
 manufacturer = "Joseph Weisbecker"
 categories = "Emulator"
 systemname = "CHIP-8"
-rpcname = "chip_8"
+systemid = "chip_8"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/emux_gb_libretro.info b/dist/info/emux_gb_libretro.info
index b78aa7dd..7c01a8e6 100644
--- a/dist/info/emux_gb_libretro.info
+++ b/dist/info/emux_gb_libretro.info
@@ -5,7 +5,7 @@ corename = "Emux GB"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy"
+systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/emux_nes_libretro.info b/dist/info/emux_nes_libretro.info
index 971a780a..fd2ade37 100644
--- a/dist/info/emux_nes_libretro.info
+++ b/dist/info/emux_nes_libretro.info
@@ -5,7 +5,7 @@ corename = "Emux NES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/emux_sms_libretro.info b/dist/info/emux_sms_libretro.info
index 5ca89477..96a10b47 100644
--- a/dist/info/emux_sms_libretro.info
+++ b/dist/info/emux_sms_libretro.info
@@ -5,7 +5,7 @@ corename = "Emux SMS"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Master System"
-rpcname = "master_system"
+systemid = "master_system"
 database = "Sega - Master System - Mark III"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/fbalpha2012_cps1_libretro.info b/dist/info/fbalpha2012_cps1_libretro.info
index cab99caf..1a2024a8 100644
--- a/dist/info/fbalpha2012_cps1_libretro.info
+++ b/dist/info/fbalpha2012_cps1_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha 2012 CPS-1"
 manufacturer = "Capcom"
 categories = "Emulator"
 systemname = "CP System I"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.28"
diff --git a/dist/info/fbalpha2012_cps2_libretro.info b/dist/info/fbalpha2012_cps2_libretro.info
index b188e188..c98b3343 100644
--- a/dist/info/fbalpha2012_cps2_libretro.info
+++ b/dist/info/fbalpha2012_cps2_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha 2012 CPS-2"
 manufacturer = "Capcom"
 categories = "Emulator"
 systemname = "CP System II"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.28"
diff --git a/dist/info/fbalpha2012_cps3_libretro.info b/dist/info/fbalpha2012_cps3_libretro.info
index 398450ec..ffae2990 100644
--- a/dist/info/fbalpha2012_cps3_libretro.info
+++ b/dist/info/fbalpha2012_cps3_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha 2012 CPS-3"
 manufacturer = "Capcom"
 categories = "Emulator"
 systemname = "CP System III"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.29"
diff --git a/dist/info/fbalpha2012_libretro.info b/dist/info/fbalpha2012_libretro.info
index fff3231e..5d96eea8 100644
--- a/dist/info/fbalpha2012_libretro.info
+++ b/dist/info/fbalpha2012_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha 2012"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.29"
diff --git a/dist/info/fbalpha2012_neogeo_libretro.info b/dist/info/fbalpha2012_neogeo_libretro.info
index 16bb72f9..a07d9a91 100644
--- a/dist/info/fbalpha2012_neogeo_libretro.info
+++ b/dist/info/fbalpha2012_neogeo_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha 2012 Neo Geo"
 manufacturer = "SNK"
 categories = "Emulator"
 systemname = "Neo Geo"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 license = "Non-commercial"
 permissions = ""
 display_version = "v0.2.97.29"
diff --git a/dist/info/fbalpha_libretro.info b/dist/info/fbalpha_libretro.info
index d57382a1..1d9234a2 100644
--- a/dist/info/fbalpha_libretro.info
+++ b/dist/info/fbalpha_libretro.info
@@ -5,7 +5,7 @@ corename = "FB Alpha"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "fb_alpha"
+systemid = "fb_alpha"
 database = "FB Alpha - Arcade Games"
 database_match_archive_member = "true"
 license = "Non-commercial"
diff --git a/dist/info/fceumm_libretro.info b/dist/info/fceumm_libretro.info
index 642e11f4..baf2cac1 100644
--- a/dist/info/fceumm_libretro.info
+++ b/dist/info/fceumm_libretro.info
@@ -5,7 +5,7 @@ corename = "FCEUmm"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/fixgb_libretro.info b/dist/info/fixgb_libretro.info
index 6f1b1358..461c32e7 100644
--- a/dist/info/fixgb_libretro.info
+++ b/dist/info/fixgb_libretro.info
@@ -5,7 +5,7 @@ corename = "fixGB"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy"
+systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/fixnes_libretro.info b/dist/info/fixnes_libretro.info
index 7181e984..44c7560c 100644
--- a/dist/info/fixnes_libretro.info
+++ b/dist/info/fixnes_libretro.info
@@ -5,7 +5,7 @@ corename = "fixNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/fmsx_libretro.info b/dist/info/fmsx_libretro.info
index e5cbd712..e842d688 100644
--- a/dist/info/fmsx_libretro.info
+++ b/dist/info/fmsx_libretro.info
@@ -5,7 +5,7 @@ corename = "fMSX"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MSX"
-rpcname = "msx"
+systemid = "msx"
 database = "Microsoft - MSX|Microsoft - MSX2"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/freeintv_libretro.info b/dist/info/freeintv_libretro.info
index 748b1384..cf286c88 100644
--- a/dist/info/freeintv_libretro.info
+++ b/dist/info/freeintv_libretro.info
@@ -5,7 +5,7 @@ corename = "FreeIntv"
 manufacturer = "Mattel"
 categories = "Emulator"
 systemname = "Intellivision"
-rpcname = "intellivision"
+systemid = "intellivision"
 database = "Mattel - Intellivision"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/frodo_libretro.info b/dist/info/frodo_libretro.info
index 6296d357..22ffeaca 100644
--- a/dist/info/frodo_libretro.info
+++ b/dist/info/frodo_libretro.info
@@ -3,7 +3,7 @@ authors = "Frodo Team Members"
 supported_extensions = "d64|t64|x64|p00|lnx|zip"
 corename = "Frodo"
 manufacturer = "Commodore"
-rpcname = "commodore_64"
+systemid = "commodore_64"
 categories = "Emulator"
 systemname = "C64"
 database = "Commodore - 64"
diff --git a/dist/info/fsuae_libretro.info b/dist/info/fsuae_libretro.info
index 6acf3151..91a8908b 100644
--- a/dist/info/fsuae_libretro.info
+++ b/dist/info/fsuae_libretro.info
@@ -5,7 +5,7 @@ corename = "FS-UAE"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "Amiga"
-rpcname = "amiga"
+systemid = "amiga"
 database = "Commodore - Amiga"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/fuse_libretro.info b/dist/info/fuse_libretro.info
index 8c976f51..9bf977a2 100644
--- a/dist/info/fuse_libretro.info
+++ b/dist/info/fuse_libretro.info
@@ -5,7 +5,7 @@ corename = "Fuse"
 manufacturer = "Sinclair|Amstrad"
 categories = "Emulator"
 systemname = "ZX Spectrum (various)"
-rpcname = "zx_spectrum"
+systemid = "zx_spectrum"
 database = "Sinclair - ZX Spectrum +3|Sinclair - ZX Spectrum"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/gambatte_libretro.info b/dist/info/gambatte_libretro.info
index abe34e2d..1000c76f 100644
--- a/dist/info/gambatte_libretro.info
+++ b/dist/info/gambatte_libretro.info
@@ -5,7 +5,7 @@ corename = "Gambatte"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy"
+systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/gearboy_libretro.info b/dist/info/gearboy_libretro.info
index 75fa2c03..b1d8b904 100644
--- a/dist/info/gearboy_libretro.info
+++ b/dist/info/gearboy_libretro.info
@@ -5,7 +5,7 @@ corename = "Gearboy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy"
+systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/gearsystem_libretro.info b/dist/info/gearsystem_libretro.info
index 7343fc1d..981fab77 100644
--- a/dist/info/gearsystem_libretro.info
+++ b/dist/info/gearsystem_libretro.info
@@ -5,7 +5,7 @@ corename = "Gearsystem"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega 8-bit (MS/GG)"
-rpcname = "game_gear"
+systemid = "game_gear"
 database = "Sega - Game Gear|Sega - Master System - Mark III"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info
index 67da22ad..1850d8c7 100644
--- a/dist/info/genesis_plus_gx_libretro.info
+++ b/dist/info/genesis_plus_gx_libretro.info
@@ -5,7 +5,7 @@ corename = "Genesis Plus GX"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega 8/16-bit (Various)"
-rpcname = "mega_drive"
+systemid = "mega_drive"
 database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/gpsp_libretro.info b/dist/info/gpsp_libretro.info
index 5b17df33..a2c6d1a6 100644
--- a/dist/info/gpsp_libretro.info
+++ b/dist/info/gpsp_libretro.info
@@ -5,7 +5,7 @@ corename = "gpSP"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/handy_libretro.info b/dist/info/handy_libretro.info
index a89ff83a..58bb5f47 100644
--- a/dist/info/handy_libretro.info
+++ b/dist/info/handy_libretro.info
@@ -5,7 +5,7 @@ corename = "Handy"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Lynx"
-rpcname = "atari_lynx"
+systemid = "atari_lynx"
 database = "Atari - Lynx"
 license = "Zlib"
 permissions = ""
diff --git a/dist/info/hatari_libretro.info b/dist/info/hatari_libretro.info
index 026279b6..9220d6fb 100644
--- a/dist/info/hatari_libretro.info
+++ b/dist/info/hatari_libretro.info
@@ -5,7 +5,7 @@ corename = "Hatari"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari ST/STE/TT/Falcon"
-rpcname = "atari_st"
+systemid = "atari_st"
 license = "GPLv2"
 permissions = ""
 display_version = "1.8"
diff --git a/dist/info/higan_sfc_balanced_libretro.info b/dist/info/higan_sfc_balanced_libretro.info
index 4318d8d8..6d64aaf2 100644
--- a/dist/info/higan_sfc_balanced_libretro.info
+++ b/dist/info/higan_sfc_balanced_libretro.info
@@ -5,7 +5,7 @@ corename = "nSide (Super Famicom Balanced)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/higan_sfc_libretro.info b/dist/info/higan_sfc_libretro.info
index 5614916a..0572fed4 100644
--- a/dist/info/higan_sfc_libretro.info
+++ b/dist/info/higan_sfc_libretro.info
@@ -5,7 +5,7 @@ corename = "higan (Super Famicom Accuracy)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/ishiiruka_libretro.info b/dist/info/ishiiruka_libretro.info
index 2670788e..57f6f8d5 100644
--- a/dist/info/ishiiruka_libretro.info
+++ b/dist/info/ishiiruka_libretro.info
@@ -5,7 +5,7 @@ corename = "Ishiiruka"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "GameCube / Wii"
-rpcname = "gamecube"
+systemid = "gamecube"
 database = "Nintendo - GameCube|Nintendo - Wii"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/mame2000_libretro.info b/dist/info/mame2000_libretro.info
index 838879a6..f1be6e09 100644
--- a/dist/info/mame2000_libretro.info
+++ b/dist/info/mame2000_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2000 (0.37b5)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2000"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2003_libretro.info b/dist/info/mame2003_libretro.info
index 961fedea..c5e92e5d 100644
--- a/dist/info/mame2003_libretro.info
+++ b/dist/info/mame2003_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2003 (0.78)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2003"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2003_midway_libretro.info b/dist/info/mame2003_midway_libretro.info
index d6bff12d..822bb06f 100644
--- a/dist/info/mame2003_midway_libretro.info
+++ b/dist/info/mame2003_midway_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2003 Midway (0.78)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2003 (Midway)"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2003_plus_libretro.info b/dist/info/mame2003_plus_libretro.info
index 5e368f1f..535a95c7 100644
--- a/dist/info/mame2003_plus_libretro.info
+++ b/dist/info/mame2003_plus_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2003 Plus"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2003-Plus"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2009_libretro.info b/dist/info/mame2009_libretro.info
index ae9f6625..21edc2ed 100644
--- a/dist/info/mame2009_libretro.info
+++ b/dist/info/mame2009_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2009 (0.135u4)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2009"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2010_libretro.info b/dist/info/mame2010_libretro.info
index a6fcb4f1..eb14a3d8 100644
--- a/dist/info/mame2010_libretro.info
+++ b/dist/info/mame2010_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2010 (0.139)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2010"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2014_libretro.info b/dist/info/mame2014_libretro.info
index 2e61ae81..a0f7d2e7 100644
--- a/dist/info/mame2014_libretro.info
+++ b/dist/info/mame2014_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2014 (0.159)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2014"
 license = "MAME"
 permissions = ""
diff --git a/dist/info/mame2016_libretro.info b/dist/info/mame2016_libretro.info
index efa462df..f374403a 100644
--- a/dist/info/mame2016_libretro.info
+++ b/dist/info/mame2016_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME 2016 (0.174)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME 2016"
 license = "GPLv2+"
 permissions = ""
diff --git a/dist/info/mame_libretro.info b/dist/info/mame_libretro.info
index da67bf95..96d7397a 100644
--- a/dist/info/mame_libretro.info
+++ b/dist/info/mame_libretro.info
@@ -5,7 +5,7 @@ corename = "MAME (Git)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "Arcade (various)"
-rpcname = "mame"
+systemid = "mame"
 database = "MAME"
 database_match_archive_member = "true"
 license = "GPLv2+"
diff --git a/dist/info/mednafen_gba_libretro.info b/dist/info/mednafen_gba_libretro.info
index 59071153..6b0d1e58 100644
--- a/dist/info/mednafen_gba_libretro.info
+++ b/dist/info/mednafen_gba_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle GBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_lynx_libretro.info b/dist/info/mednafen_lynx_libretro.info
index 073a75e1..92977b48 100644
--- a/dist/info/mednafen_lynx_libretro.info
+++ b/dist/info/mednafen_lynx_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle Lynx"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Lynx"
-rpcname = "atari_lynx"
+systemid = "atari_lynx"
 database = "Atari - Lynx"
 license = "Zlib|GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_ngp_libretro.info b/dist/info/mednafen_ngp_libretro.info
index db1e24c0..286e06b5 100644
--- a/dist/info/mednafen_ngp_libretro.info
+++ b/dist/info/mednafen_ngp_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle NeoPop"
 manufacturer = "SNK"
 categories = "Emulator"
 systemname = "Neo Geo Pocket (Color)"
-rpcname = "neo_geo_pocket"
+systemid = "neo_geo_pocket"
 database = "SNK - Neo Geo Pocket|SNK - Neo Geo Pocket Color"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_pce_fast_libretro.info b/dist/info/mednafen_pce_fast_libretro.info
index bc2a0865..6745bbfb 100644
--- a/dist/info/mednafen_pce_fast_libretro.info
+++ b/dist/info/mednafen_pce_fast_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle PCE Fast"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC Engine/PCE-CD"
-rpcname = "pc_engine"
+systemid = "pc_engine"
 database = "NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_pcfx_libretro.info b/dist/info/mednafen_pcfx_libretro.info
index a0c90413..ae1c7dcf 100644
--- a/dist/info/mednafen_pcfx_libretro.info
+++ b/dist/info/mednafen_pcfx_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle PC-FX"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC-FX"
-rpcname = "pc_fx"
+systemid = "pc_fx"
 database = "NEC - PC-FX"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_psx_hw_libretro.info b/dist/info/mednafen_psx_hw_libretro.info
index 1aa76a3e..e8a45229 100644
--- a/dist/info/mednafen_psx_hw_libretro.info
+++ b/dist/info/mednafen_psx_hw_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle PSX HW"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_psx_libretro.info b/dist/info/mednafen_psx_libretro.info
index d9d2ab53..97340945 100644
--- a/dist/info/mednafen_psx_libretro.info
+++ b/dist/info/mednafen_psx_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle PSX"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_saturn_libretro.info b/dist/info/mednafen_saturn_libretro.info
index 51faec53..a4ed8eab 100644
--- a/dist/info/mednafen_saturn_libretro.info
+++ b/dist/info/mednafen_saturn_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle Saturn"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Saturn"
-rpcname = "sega_saturn"
+systemid = "sega_saturn"
 database = "Sega - Saturn"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_snes_libretro.info b/dist/info/mednafen_snes_libretro.info
index 63006630..e623b80e 100644
--- a/dist/info/mednafen_snes_libretro.info
+++ b/dist/info/mednafen_snes_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle bsnes"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_supergrafx_libretro.info b/dist/info/mednafen_supergrafx_libretro.info
index cae89d80..247f1172 100644
--- a/dist/info/mednafen_supergrafx_libretro.info
+++ b/dist/info/mednafen_supergrafx_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle SGX"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC Engine SuperGrafx"
-rpcname = "pc_engine"
+systemid = "pc_engine"
 database = "NEC - PC Engine SuperGrafx|NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_vb_libretro.info b/dist/info/mednafen_vb_libretro.info
index a217e03a..9a3f0a26 100644
--- a/dist/info/mednafen_vb_libretro.info
+++ b/dist/info/mednafen_vb_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle VB"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Virtual Boy"
-rpcname = "virtual_boy"
+systemid = "virtual_boy"
 database = "Nintendo - Virtual Boy"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/mednafen_wswan_libretro.info b/dist/info/mednafen_wswan_libretro.info
index 8d3e8865..0bdb9780 100644
--- a/dist/info/mednafen_wswan_libretro.info
+++ b/dist/info/mednafen_wswan_libretro.info
@@ -5,7 +5,7 @@ corename = "Beetle WonderSwan"
 manufacturer = "Bandai"
 categories = "Emulator"
 systemname = "WonderSwan/Color"
-rpcname = "wonderswan"
+systemid = "wonderswan"
 database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/melonds_libretro.info b/dist/info/melonds_libretro.info
index 138a4c9f..8b32f24c 100644
--- a/dist/info/melonds_libretro.info
+++ b/dist/info/melonds_libretro.info
@@ -5,7 +5,7 @@ corename = "melonDS"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo DS"
-rpcname = "nds"
+systemid = "nds"
 database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/mesen_libretro.info b/dist/info/mesen_libretro.info
index ee69a4d4..dfae7940 100644
--- a/dist/info/mesen_libretro.info
+++ b/dist/info/mesen_libretro.info
@@ -5,7 +5,7 @@ corename = "Mesen"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/mess2014_libretro.info b/dist/info/mess2014_libretro.info
index 3a88555a..34c8438d 100644
--- a/dist/info/mess2014_libretro.info
+++ b/dist/info/mess2014_libretro.info
@@ -5,7 +5,7 @@ corename = "MESS 2014 (Git)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MULTI (various)"
-rpcname = "mame"
+systemid = "mame"
 license = "MAME"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/meteor_libretro.info b/dist/info/meteor_libretro.info
index d0de6e8b..b9af4f93 100644
--- a/dist/info/meteor_libretro.info
+++ b/dist/info/meteor_libretro.info
@@ -5,7 +5,7 @@ corename = "Meteor"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/mgba_libretro.info b/dist/info/mgba_libretro.info
index 37af5073..9127d9bb 100644
--- a/dist/info/mgba_libretro.info
+++ b/dist/info/mgba_libretro.info
@@ -5,7 +5,7 @@ corename = "mGBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color/Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "MPLv2.0"
 permissions = ""
diff --git a/dist/info/mpv_libretro.info b/dist/info/mpv_libretro.info
index 79a210ad..014ae44e 100644
--- a/dist/info/mpv_libretro.info
+++ b/dist/info/mpv_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a|webm|3g
 corename = "MPV"
 categories = "Media player"
 systemname = "MPV"
-rpcname = "media"
+systemid = "media"
 license = "LGPLv2, GPLv2"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/mrboom_libretro.info b/dist/info/mrboom_libretro.info
index 0e9faa11..50f17fd0 100644
--- a/dist/info/mrboom_libretro.info
+++ b/dist/info/mrboom_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = ""
 corename = "Mr.Boom"
 categories = "Game"
 systemname = "Mr.Boom"
-rpcname = "bomberman"
+systemid = "bomberman"
 database = "MrBoom"
 license = ""
 supported_extensions = "desktop"
diff --git a/dist/info/mupen64plus_gles3_libretro.info b/dist/info/mupen64plus_gles3_libretro.info
index ea7876fc..c20a1ac7 100644
--- a/dist/info/mupen64plus_gles3_libretro.info
+++ b/dist/info/mupen64plus_gles3_libretro.info
@@ -5,7 +5,7 @@ corename = "Mupen64Plus"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
-rpcname = "nintendo_64"
+systemid = "nintendo_64"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
diff --git a/dist/info/mupen64plus_libretro.info b/dist/info/mupen64plus_libretro.info
index 51cc3854..bced177b 100644
--- a/dist/info/mupen64plus_libretro.info
+++ b/dist/info/mupen64plus_libretro.info
@@ -5,7 +5,7 @@ corename = "Mupen64Plus OpenGL"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
-rpcname = "nintendo_64"
+systemid = "nintendo_64"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
diff --git a/dist/info/nekop2_libretro.info b/dist/info/nekop2_libretro.info
index 03dba6a3..bcdde389 100644
--- a/dist/info/nekop2_libretro.info
+++ b/dist/info/nekop2_libretro.info
@@ -5,7 +5,7 @@ corename = "Neko Project II"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC-98"
-rpcname = "pc_98"
+systemid = "pc_98"
 database = "PC-98"
 license = ""
 permissions = ""
diff --git a/dist/info/nestopia_libretro.info b/dist/info/nestopia_libretro.info
index 87be37b3..0d292da0 100644
--- a/dist/info/nestopia_libretro.info
+++ b/dist/info/nestopia_libretro.info
@@ -5,7 +5,7 @@ corename = "Nestopia"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/np2kai_libretro.info b/dist/info/np2kai_libretro.info
index d67cb4a9..70623ad6 100644
--- a/dist/info/np2kai_libretro.info
+++ b/dist/info/np2kai_libretro.info
@@ -5,7 +5,7 @@ corename = "Neko Project II"
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC-98"
-rpcname = "pc_98"
+systemid = "pc_98"
 database = "PC-98"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/nxengine_libretro.info b/dist/info/nxengine_libretro.info
index b7dbf0cd..c441710d 100644
--- a/dist/info/nxengine_libretro.info
+++ b/dist/info/nxengine_libretro.info
@@ -5,7 +5,7 @@ corename = "NXEngine"
 categories = "Game"
 database = "Cave Story"
 systemname = "Cave Story Game Engine"
-rpcname = "nxengine"
+systemid = "nxengine"
 license = "GPLv3"
 permissions = ""
 display_version = "1.0.0.6"
diff --git a/dist/info/o2em_libretro.info b/dist/info/o2em_libretro.info
index 374d7672..34af0d54 100644
--- a/dist/info/o2em_libretro.info
+++ b/dist/info/o2em_libretro.info
@@ -5,7 +5,7 @@ corename = "O2EM"
 manufacturer = "Magnavox|Philips"
 categories = "Emulator"
 systemname = "Magnavox Odyssey2 / Phillips Videopac+"
-rpcname = "odyssey2"
+systemid = "odyssey2"
 database = "Magnavox - Odyssey2|Phillips - Videopac+"
 license = "Artistic License"
 permissions = ""
diff --git a/dist/info/openlara_libretro.info b/dist/info/openlara_libretro.info
index c7184791..55580b9c 100644
--- a/dist/info/openlara_libretro.info
+++ b/dist/info/openlara_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "phd|psx|tr2"
 corename = "OpenLara"
 categories = "Game"
 systemname = "Classic Tomb Raider engine"
-rpcname = "openlara"
+systemid = "openlara"
 database = "Tomb Raider"
 license = "2-clause BSD"
 permissions = ""
diff --git a/dist/info/parallel_n64_debug_libretro.info b/dist/info/parallel_n64_debug_libretro.info
index 078158ae..fc77aaf1 100644
--- a/dist/info/parallel_n64_debug_libretro.info
+++ b/dist/info/parallel_n64_debug_libretro.info
@@ -5,7 +5,7 @@ corename = "ParaLLEl (Debug)"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
-rpcname = "nintendo_64"
+systemid = "nintendo_64"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
diff --git a/dist/info/parallel_n64_libretro.info b/dist/info/parallel_n64_libretro.info
index a9cc8198..d83370da 100644
--- a/dist/info/parallel_n64_libretro.info
+++ b/dist/info/parallel_n64_libretro.info
@@ -5,7 +5,7 @@ corename = "ParaLLEl N64"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo 64"
-rpcname = "nintendo_64"
+systemid = "nintendo_64"
 database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
diff --git a/dist/info/pcsx1_libretro.info b/dist/info/pcsx1_libretro.info
index ed1edf9a..df8c1350 100644
--- a/dist/info/pcsx1_libretro.info
+++ b/dist/info/pcsx1_libretro.info
@@ -5,7 +5,7 @@ corename = "PCSX1"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
diff --git a/dist/info/pcsx_rearmed_interpreter_libretro.info b/dist/info/pcsx_rearmed_interpreter_libretro.info
index 09eb631e..8d1c033d 100644
--- a/dist/info/pcsx_rearmed_interpreter_libretro.info
+++ b/dist/info/pcsx_rearmed_interpreter_libretro.info
@@ -5,7 +5,7 @@ corename = "PCSX ReARMed [Interpreter]"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/pcsx_rearmed_libretro.info b/dist/info/pcsx_rearmed_libretro.info
index 473937ae..e6cc1776 100644
--- a/dist/info/pcsx_rearmed_libretro.info
+++ b/dist/info/pcsx_rearmed_libretro.info
@@ -5,7 +5,7 @@ corename = "PCSX ReARMed"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
diff --git a/dist/info/pcsx_rearmed_libretro_neon.info b/dist/info/pcsx_rearmed_libretro_neon.info
index c17abc93..51e91c0b 100644
--- a/dist/info/pcsx_rearmed_libretro_neon.info
+++ b/dist/info/pcsx_rearmed_libretro_neon.info
@@ -5,7 +5,7 @@ corename = "PCSX ReARMed [NEON]"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
diff --git a/dist/info/picodrive_libretro.info b/dist/info/picodrive_libretro.info
index 12b23d7f..507e6a32 100644
--- a/dist/info/picodrive_libretro.info
+++ b/dist/info/picodrive_libretro.info
@@ -5,7 +5,7 @@ corename = "PicoDrive"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega 8/16-bit + 32X (Various)"
-rpcname = "mega_drive"
+systemid = "mega_drive"
 database = "Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - 32X"
 license = "MAME"
 permissions = "dynarec_optional"
diff --git a/dist/info/pocketcdg_libretro.info b/dist/info/pocketcdg_libretro.info
index 9a24a71d..865eb648 100644
--- a/dist/info/pocketcdg_libretro.info
+++ b/dist/info/pocketcdg_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "cdg"
 corename = "PocketCDG"
 categories = "Karaoke player"
 systemname = "Music"
-rpcname = "media"
+systemid = "media"
 license = "MIT"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/pokemini_libretro.info b/dist/info/pokemini_libretro.info
index b15044a6..0ff39c64 100644
--- a/dist/info/pokemini_libretro.info
+++ b/dist/info/pokemini_libretro.info
@@ -5,7 +5,7 @@ corename = "PokeMini"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Pokémon Mini"
-rpcname = "pokemon_mini"
+systemid = "pokemon_mini"
 database = "Nintendo - Pokemon Mini"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/ppsspp_libretro.info b/dist/info/ppsspp_libretro.info
index 7214756f..9dbd6a70 100644
--- a/dist/info/ppsspp_libretro.info
+++ b/dist/info/ppsspp_libretro.info
@@ -5,7 +5,7 @@ corename = "PPSSPP"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PSP"
-rpcname = "playstation_portable"
+systemid = "playstation_portable"
 database = "Sony - PlayStation Portable"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/prboom_libretro.info b/dist/info/prboom_libretro.info
index 4d4da491..74a84009 100644
--- a/dist/info/prboom_libretro.info
+++ b/dist/info/prboom_libretro.info
@@ -5,7 +5,7 @@ corename = "PrBoom"
 manufacturer = "Id Software"
 categories = "Game"
 systemname = "DOOM Game Engine"
-rpcname = "doom"
+systemid = "doom"
 database = "DOOM"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/prosystem_libretro.info b/dist/info/prosystem_libretro.info
index 33a3679f..4c7e69d9 100644
--- a/dist/info/prosystem_libretro.info
+++ b/dist/info/prosystem_libretro.info
@@ -5,7 +5,7 @@ corename = "ProSystem"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 7800"
-rpcname = "atari_7800"
+systemid = "atari_7800"
 database = "Atari - 7800"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/puae_libretro.info b/dist/info/puae_libretro.info
index 451fa4d2..51aeefa9 100644
--- a/dist/info/puae_libretro.info
+++ b/dist/info/puae_libretro.info
@@ -5,7 +5,7 @@ corename = "PUAE"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "Commodore Amiga"
-rpcname = "amiga"
+systemid = "amiga"
 license = "GPLv2"
 permissions = ""
 display_version = "v2.6.1"
diff --git a/dist/info/px68k_libretro.info b/dist/info/px68k_libretro.info
index 9571a696..9e2de6b4 100644
--- a/dist/info/px68k_libretro.info
+++ b/dist/info/px68k_libretro.info
@@ -5,7 +5,7 @@ corename = "PX68k"
 manufacturer = "Sharp"
 categories = "Emulator"
 systemname = "Sharp X68000"
-rpcname = "sharp_x68000"
+systemid = "sharp_x68000"
 database = "Sharp - X68000"
 license = ""
 permissions = ""
diff --git a/dist/info/quicknes_libretro.info b/dist/info/quicknes_libretro.info
index 672f1c85..2680828d 100644
--- a/dist/info/quicknes_libretro.info
+++ b/dist/info/quicknes_libretro.info
@@ -5,7 +5,7 @@ corename = "QuickNES"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Nintendo Entertainment System"
-rpcname = "nes"
+systemid = "nes"
 database = "Nintendo - Nintendo Entertainment System"
 license = "LGPLv2.1+"
 permissions = ""
diff --git a/dist/info/redream_libretro.info b/dist/info/redream_libretro.info
index 1d39e171..61b6dee3 100644
--- a/dist/info/redream_libretro.info
+++ b/dist/info/redream_libretro.info
@@ -5,7 +5,7 @@ corename = "Redream"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Dreamcast"
-rpcname = "dreamcast"
+systemid = "dreamcast"
 database = "Sega - Dreamcast"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/reicast_libretro.info b/dist/info/reicast_libretro.info
index be8d4a5e..1467fc28 100644
--- a/dist/info/reicast_libretro.info
+++ b/dist/info/reicast_libretro.info
@@ -5,7 +5,7 @@ corename = "Reicast"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Dreamcast"
-rpcname = "dreamcast"
+systemid = "dreamcast"
 database = "Sega - Dreamcast|Sega - NAOMI"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/reicast_oit_libretro.info b/dist/info/reicast_oit_libretro.info
index 34ed6be1..8271dbb0 100644
--- a/dist/info/reicast_oit_libretro.info
+++ b/dist/info/reicast_oit_libretro.info
@@ -5,7 +5,7 @@ corename = "Reicast OIT"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Dreamcast"
-rpcname = "dreamcast"
+systemid = "dreamcast"
 database = "Sega - Dreamcast|Sega - NAOMI"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/remotejoy_libretro.info b/dist/info/remotejoy_libretro.info
index 26de8206..6d2624d0 100644
--- a/dist/info/remotejoy_libretro.info
+++ b/dist/info/remotejoy_libretro.info
@@ -2,7 +2,7 @@ display_name = "PSP RemotePlay (RemoteJoy)"
 authors = ""
 supported_extensions = ""
 corename = "RemoteJoy"
-rpcname = "playstation_portable"
+systemid = "playstation_portable"
 categories = "Streaming"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/rustation_libretro.info b/dist/info/rustation_libretro.info
index fc733245..c7494ae6 100644
--- a/dist/info/rustation_libretro.info
+++ b/dist/info/rustation_libretro.info
@@ -5,7 +5,7 @@ corename = "Rustation"
 manufacturer = "Sony"
 categories = "Emulator"
 systemname = "PlayStation"
-rpcname = "playstation"
+systemid = "playstation"
 database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/sameboy_libretro.info b/dist/info/sameboy_libretro.info
index 795faf71..e68c38fe 100644
--- a/dist/info/sameboy_libretro.info
+++ b/dist/info/sameboy_libretro.info
@@ -5,7 +5,7 @@ corename = "SameBoy"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy"
+systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "MIT"
 permissions = ""
diff --git a/dist/info/scummvm_libretro.info b/dist/info/scummvm_libretro.info
index 8cd5eb35..7912cfd4 100644
--- a/dist/info/scummvm_libretro.info
+++ b/dist/info/scummvm_libretro.info
@@ -5,7 +5,7 @@ corename = "ScummVM"
 manufacturer = "LucasArts"
 categories = "Game"
 systemname = "Game engine"
-rpcname = "scummvm"
+systemid = "scummvm"
 database = "ScummVM"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/snes9x2002_libretro.info b/dist/info/snes9x2002_libretro.info
index f7c765e5..59bb59ec 100644
--- a/dist/info/snes9x2002_libretro.info
+++ b/dist/info/snes9x2002_libretro.info
@@ -5,7 +5,7 @@ corename = "Snes9x 2002"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/snes9x2005_libretro.info b/dist/info/snes9x2005_libretro.info
index ef0f2bdd..8fda933c 100644
--- a/dist/info/snes9x2005_libretro.info
+++ b/dist/info/snes9x2005_libretro.info
@@ -5,7 +5,7 @@ corename = "Snes9x 2005"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/snes9x2005_plus_libretro.info b/dist/info/snes9x2005_plus_libretro.info
index 63ddff88..90db1def 100644
--- a/dist/info/snes9x2005_plus_libretro.info
+++ b/dist/info/snes9x2005_plus_libretro.info
@@ -5,7 +5,7 @@ corename = "Snes9x 2005 Plus"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/snes9x2010_libretro.info b/dist/info/snes9x2010_libretro.info
index f263d8ea..8dd143ef 100644
--- a/dist/info/snes9x2010_libretro.info
+++ b/dist/info/snes9x2010_libretro.info
@@ -5,7 +5,7 @@ corename = "Snes9x 2010"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/snes9x_libretro.info b/dist/info/snes9x_libretro.info
index 2c3eebcb..c6bd5947 100644
--- a/dist/info/snes9x_libretro.info
+++ b/dist/info/snes9x_libretro.info
@@ -5,7 +5,7 @@ corename = "Snes9x"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
-rpcname = "super_nes"
+systemid = "super_nes"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 license = "Non-commercial"
 permissions = ""
diff --git a/dist/info/stella_libretro.info b/dist/info/stella_libretro.info
index 1722b352..4084b0d3 100644
--- a/dist/info/stella_libretro.info
+++ b/dist/info/stella_libretro.info
@@ -5,7 +5,7 @@ corename = "Stella"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Atari 2600"
-rpcname = "atari_2600"
+systemid = "atari_2600"
 database = "Atari - 2600"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/tempgba_libretro.info b/dist/info/tempgba_libretro.info
index 74303bb5..9b4fbd06 100644
--- a/dist/info/tempgba_libretro.info
+++ b/dist/info/tempgba_libretro.info
@@ -5,7 +5,7 @@ corename = "TempGBA"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = game_boy_advance""
+systemid = game_boy_advance""
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/tgbdual_libretro.info b/dist/info/tgbdual_libretro.info
index 06af5d36..085b5eb5 100644
--- a/dist/info/tgbdual_libretro.info
+++ b/dist/info/tgbdual_libretro.info
@@ -5,7 +5,7 @@ corename = "TGB Dual"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy/Game Boy Color"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/tyrquake_libretro.info b/dist/info/tyrquake_libretro.info
index 5e33ecdb..d949e32d 100644
--- a/dist/info/tyrquake_libretro.info
+++ b/dist/info/tyrquake_libretro.info
@@ -5,7 +5,7 @@ corename = "TyrQuake"
 manufacturer = "Id Software"
 categories = "Game"
 systemname = "Quake Game Engine"
-rpcname = "quake_1"
+systemid = "quake_1"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.62"
diff --git a/dist/info/uae4arm_libretro.info b/dist/info/uae4arm_libretro.info
index 66936b11..61db3192 100644
--- a/dist/info/uae4arm_libretro.info
+++ b/dist/info/uae4arm_libretro.info
@@ -5,7 +5,7 @@ corename = "UAE4ARM"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "Commodore Amiga"
-rpcname = "amiga"
+systemid = "amiga"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.1"
diff --git a/dist/info/ume2014_libretro.info b/dist/info/ume2014_libretro.info
index b9eb21e5..39f65882 100644
--- a/dist/info/ume2014_libretro.info
+++ b/dist/info/ume2014_libretro.info
@@ -5,7 +5,7 @@ corename = "UME 2014 (Git)"
 manufacturer = "Various"
 categories = "Emulator"
 systemname = "MULTI (various)"
-rpcname = "mame"
+systemid = "mame"
 license = "MAME"
 permissions = ""
 display_version = "Git"
diff --git a/dist/info/uzem_libretro.info b/dist/info/uzem_libretro.info
index 6f66bfc1..2b8f6716 100644
--- a/dist/info/uzem_libretro.info
+++ b/dist/info/uzem_libretro.info
@@ -4,7 +4,7 @@ corename = "uzem"
 manufacturer = "Uzebox"
 categories = "Emulator"
 systemname = "Uzebox"
-rpcname = "uzebox"
+systemid = "uzebox"
 database = "Uzebox"
 license = "MIT"
 supports_no_game = "false"
diff --git a/dist/info/vba_next_libretro.info b/dist/info/vba_next_libretro.info
index 4c4ff004..d56c72c4 100644
--- a/dist/info/vba_next_libretro.info
+++ b/dist/info/vba_next_libretro.info
@@ -5,7 +5,7 @@ corename = "VBA Next"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/vbam_libretro.info b/dist/info/vbam_libretro.info
index 291e641a..69d9996e 100644
--- a/dist/info/vbam_libretro.info
+++ b/dist/info/vbam_libretro.info
@@ -5,7 +5,7 @@ corename = "VBA-M"
 manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Game Boy Advance"
-rpcname = "game_boy_advance"
+systemid = "game_boy_advance"
 database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/vecx_libretro.info b/dist/info/vecx_libretro.info
index 72789f50..b49f1161 100644
--- a/dist/info/vecx_libretro.info
+++ b/dist/info/vecx_libretro.info
@@ -5,7 +5,7 @@ corename = "vecx"
 manufacturer = "Smith Engineering|General Consumer Electronics"
 categories = "Emulator"
 systemname = "Vectrex"
-rpcname = "vectrex"
+systemid = "vectrex"
 database = "GCE - Vectrex"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/vice_x64_libretro.info b/dist/info/vice_x64_libretro.info
index 3966ebd0..5abfe989 100644
--- a/dist/info/vice_x64_libretro.info
+++ b/dist/info/vice_x64_libretro.info
@@ -5,7 +5,7 @@ corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "C64"
-rpcname = "commodore_64"
+systemid = "commodore_64"
 database = "Commodore - 64"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/vice_xplus4_libretro.info b/dist/info/vice_xplus4_libretro.info
index a97ab2c8..87465af1 100644
--- a/dist/info/vice_xplus4_libretro.info
+++ b/dist/info/vice_xplus4_libretro.info
@@ -5,7 +5,7 @@ corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "PLUS4"
-rpcname = "commodore_plus_4"
+systemid = "commodore_plus_4"
 database = "Commodore - PLUS4"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/vice_xvic_libretro.info b/dist/info/vice_xvic_libretro.info
index 28a32fec..5cc0517f 100644
--- a/dist/info/vice_xvic_libretro.info
+++ b/dist/info/vice_xvic_libretro.info
@@ -5,7 +5,7 @@ corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "VIC20"
-rpcname = "commodore_vic_20"
+systemid = "commodore_vic_20"
 database = "Commodore - VIC20"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/virtualjaguar_libretro.info b/dist/info/virtualjaguar_libretro.info
index 2b4c7858..e6d25ff0 100644
--- a/dist/info/virtualjaguar_libretro.info
+++ b/dist/info/virtualjaguar_libretro.info
@@ -5,7 +5,7 @@ corename = "Virtual Jaguar"
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Jaguar"
-rpcname = "atari_jaguar"
+systemid = "atari_jaguar"
 database = "Atari - Jaguar"
 license = "GPLv3"
 permissions = ""
diff --git a/dist/info/x64sdl_libretro.info b/dist/info/x64sdl_libretro.info
index 69d9c84c..a2eb8fe2 100644
--- a/dist/info/x64sdl_libretro.info
+++ b/dist/info/x64sdl_libretro.info
@@ -5,7 +5,7 @@ corename = "VICE SDL"
 manufacturer = "Commodore"
 categories = "Emulator"
 systemname = "C64"
-rpcname = "commodore_64"
+systemid = "commodore_64"
 database = "Commodore - 64"
 license = "GPLv2"
 permissions = ""
diff --git a/dist/info/xrick_libretro.info b/dist/info/xrick_libretro.info
index 72efdc82..9068a9c0 100644
--- a/dist/info/xrick_libretro.info
+++ b/dist/info/xrick_libretro.info
@@ -5,7 +5,7 @@ corename = "XRick"
 categories = "Game"
 database = "Rick Dangerous"
 systemname = "Rick Dangerous Game Engine"
-rpcname = "xrick"
+systemid = "xrick"
 license = "GPLv3"
 permissions = ""
 display_version = "1.0.0.6"
diff --git a/dist/info/yabause_libretro.info b/dist/info/yabause_libretro.info
index b157eed4..77190d17 100644
--- a/dist/info/yabause_libretro.info
+++ b/dist/info/yabause_libretro.info
@@ -5,7 +5,7 @@ corename = "Yabause"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Saturn"
-rpcname = "sega_saturn"
+systemid = "sega_saturn"
 database = "Sega - Saturn"
 license = "GPLv2"
 permissions = ""