diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 3b988af7..5c3cd979 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -276,17 +276,17 @@ build_libretro_databases() {
 	build_libretro_database "Nintendo - Game Boy Color" "rom.crc"
 	build_libretro_database "Nintendo - GameCube" "rom.serial"
 	build_libretro_database "Nintendo - Nintendo 3DS" "rom.crc"
-	build_libretro_database "Nintendo - Nintendo 3DS (DLC)" "rom.crc"
+	build_libretro_database "Nintendo - Nintendo 3DS (Digital)" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo DS" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo DS (Download Play)" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo DSi" "rom.crc"
-	build_libretro_database "Nintendo - Nintendo DSi (DLC)" "rom.crc"
+	build_libretro_database "Nintendo - Nintendo DSi (Digital)" "rom.crc"
 	build_libretro_database "Nintendo - Nintendo Entertainment System" "rom.crc"
-	build_libretro_database "Nintendo - Nintendo Wii (DLC)" "rom.crc"
 	build_libretro_database "Nintendo - Pokemon Mini" "rom.crc"
 	build_libretro_database "Nintendo - Satellaview" "rom.crc"
 	build_libretro_database "Nintendo - Sufami Turbo" "rom.crc"
 	build_libretro_database "Nintendo - Wii" "rom.serial"
+	build_libretro_database "Nintendo - Wii (Digital)" "rom.crc"
 	build_libretro_database "The 3DO Company - 3DO" "rom.crc"
 	build_libretro_database "Philips - Videopac+" "rom.crc"
 	build_libretro_database "RCA - Studio II" "rom.crc"
@@ -308,11 +308,9 @@ build_libretro_databases() {
 	build_libretro_database "SNK - Neo Geo Pocket" "rom.crc"
 	build_libretro_database "SNK - Neo Geo Pocket Color" "rom.crc"
 	build_libretro_database "Sony - PlayStation 2" "rom.serial"
-	build_libretro_database "Sony - PlayStation 3 (DLC)" "rom.crc"
-	build_libretro_database "Sony - PlayStation 3 (Downloadable)" "rom.crc"
 	build_libretro_database "Sony - PlayStation 3 (PSN)" "rom.crc"
 	build_libretro_database "Sony - PlayStation Portable" "rom.serial"
-	build_libretro_database "Sony - PlayStation Portable (DLC)" "rom.crc"
+	build_libretro_database "Sony - PlayStation Portable (PSN)" "rom.crc"
 	build_libretro_database "Sony - PlayStation Portable (PSX2PSP)" "rom.crc"
 	build_libretro_database "Sony - PlayStation Portable (UMD Music)" "rom.crc"
 	build_libretro_database "Sony - PlayStation Portable (UMD Video)" "rom.crc"