diff --git a/hash/gjrstar.xml b/hash/gjrstar.xml
index 03fe6974b2e..61932d56e0e 100644
--- a/hash/gjrstar.xml
+++ b/hash/gjrstar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <softwarelist name="gjrstar" description="VTech Genius Junior Redstar cartridges">
 
-<!-- According to the boxart, this is compatible with: Junior Redstar/Redstar 2 -->
+<!-- According to the boxart, this is compatible with: Junior Redstar/Redstar 2/Redstar 3 -->
 	<software name="wortspie">
 		<description>Wortspiele</description>
 		<year>200?</year>
diff --git a/hash/genius.xml b/hash/gln.xml
similarity index 75%
rename from hash/genius.xml
rename to hash/gln.xml
index 184d0c635fe..ebd5c722432 100644
--- a/hash/genius.xml
+++ b/hash/gln.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
-<softwarelist name="genius" description="VTech Genius cartridges">
-
-<!-- this software list contains miscellaneous VTech Genius family cartridges, needs to be split to respective systems later -->
-
-
-<!-- Compatible with: Genius Leader series (actual compatible models as listed on the box are documented below) -->
+<softwarelist name="gln" description="VTech Genius Leader Notebook cartridges">
 
 <!-- According to the boxart, this is compatible with: Leader Notebook -->
 	<software name="franzosis">
@@ -21,9 +16,10 @@
 		</part>
 	</software>
 
-<!-- According to the boxart, this is compatible with: Leader Notebook/Notebook Plus/Power Notebook -->
-	<software name="swga" cloneof="swg">
-		<description>Sport-Wissen-Geschichte (Genius Leader Notebook)</description>
+<!-- According to the boxart, this is compatible with: Leader Notebook
+     A (later) sticker says compatibility extends to Notebook Plus/Power Notebook -->
+	<software name="swg">
+		<description>Sport-Wissen-Geschichte</description>
 		<year>200?</year>
 		<publisher>Video Technology</publisher>
 		<info name="serial" value="80-2455" />
diff --git a/src/mame/drivers/geniusjr.cpp b/src/mame/drivers/geniusjr.cpp
index 4e2ca49ef0f..0fa1139fc56 100644
--- a/src/mame/drivers/geniusjr.cpp
+++ b/src/mame/drivers/geniusjr.cpp
@@ -220,21 +220,23 @@ void geniusjr_state::machine_start()
 	m_rombank->set_entry(0);
 }
 
-void geniusjr_state::gln(machine_config &config)
+void geniusjr_state::gj4000(machine_config &config)
 {
 	M68HC05L9(config, m_maincpu, 8'000'000); // unknown clock
 	m_maincpu->set_addrmap(AS_PROGRAM, &geniusjr_state::gj4000_map);
 
 	m_bank_size = 0x8000;
-}
-
-void geniusjr_state::gj4000(machine_config &config)
-{
-	gln(config);
 
 	SOFTWARE_LIST(config, "cart_list").set_original("gj4000");
 }
 
+void geniusjr_state::gln(machine_config &config)
+{
+	gj4000(config);
+
+	subdevice<software_list_device>("cart_list")->set_original("gln");
+}
+
 void geniusjr_state::gj5000(machine_config &config)
 {
 	M68HC05L9(config, m_maincpu, 8'000'000); // unknown clock (type also uncertain)