diff --git a/dist/info/gw_libretro.info b/dist/info/gw_libretro.info
index fdaf7d18..c7b22d43 100644
--- a/dist/info/gw_libretro.info
+++ b/dist/info/gw_libretro.info
@@ -2,10 +2,10 @@ display_name = "Game & Watch (GW)"
 authors = "Andre Leiradella"
 supported_extensions = "mgw"
 corename = "GW"
-manufacturer = "Nintendo"
+manufacturer = "Various"
 categories = "Emulator"
-systemname = "Game & Watch"
-database = "Nintendo - Game and Watch"
+systemname = "Handheld Electronic Game"
+database = "Handheld Electronic Game"
 license = "zlib"
 permissions = ""
 display_version = "Git"