diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 90fe47090a1..204756bbdeb 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1411,14 +1411,14 @@ static DRIVER_INIT( nomnlnd )
 GAME( 1979, cosmicg,  0,       cosmicg,  cosmicg,  cosmicg, ROT270, "Universal", "Cosmic Guerilla", GAME_NO_COCKTAIL )
 GAME( 1979, cosmica,  0,       cosmica,  cosmica,  0,       ROT270, "Universal", "Cosmic Alien", GAME_NO_SOUND )
 GAME( 1979, cosmica2, cosmica, cosmica,  cosmica,  0,       ROT270, "Universal", "Cosmic Alien (older)", GAME_NO_SOUND )
+GAME( 1980, nomnlnd,  0,       nomnlnd,  nomnlnd,  nomnlnd, ROT270, "Universal", "No Man's Land", GAME_IMPERFECT_SOUND )
+GAME( 1980, nomnlndg, nomnlnd, nomnlnd,  nomnlndg, nomnlnd, ROT270, "Universal (Gottlieb license)", "No Man's Land (Gottlieb)", GAME_IMPERFECT_SOUND )
+GAME( 1980, magspot,  0,       magspot,  magspot,  0,       ROT270, "Universal", "Magical Spot", GAME_IMPERFECT_SOUND )
+GAME( 1980, magspot2, 0,       magspot,  magspot,  0,       ROT270, "Universal", "Magical Spot II", GAME_IMPERFECT_SOUND )
 GAME( 1980, panic,    0,       panic,    panic,    0,       ROT270, "Universal", "Space Panic (version E)", 0 )
 GAME( 1980, panic2,   panic,   panic,    panic,    0,       ROT270, "Universal", "Space Panic (set 2)", 0 )
 GAME( 1980, panic3,   panic,   panic,    panic,    0,       ROT270, "Universal", "Space Panic (set 3)", 0 )
 GAME( 1980, panich,   panic,   panic,    panic,    0,       ROT270, "Universal", "Space Panic (harder)", 0 )
 GAME( 1980, panicger, panic,   panic,    panic,    0,       ROT270, "Universal (ADP Automaten license)", "Space Panic (German)", 0 )
-GAME( 1980, magspot,  0,	   magspot,  magspot,  0,       ROT270, "Universal", "Magical Spot", GAME_IMPERFECT_SOUND )
-GAME( 1980, magspot2, 0,       magspot,  magspot,  0,       ROT270, "Universal", "Magical Spot II", GAME_IMPERFECT_SOUND )
 GAME( 1980, devzone,  0,       devzone,  devzone,  devzone, ROT270, "Universal", "Devil Zone", GAME_IMPERFECT_SOUND )
 GAME( 1980, devzone2, devzone, devzone,  devzone2, devzone, ROT270, "Universal", "Devil Zone (easier)", GAME_IMPERFECT_SOUND )
-GAME( 1980, nomnlnd,  0,       nomnlnd,  nomnlnd,  nomnlnd, ROT270, "Universal", "No Man's Land", GAME_IMPERFECT_SOUND )
-GAME( 1980, nomnlndg, nomnlnd, nomnlnd,  nomnlndg, nomnlnd, ROT270, "Universal (Gottlieb license)", "No Man's Land (Gottlieb)", GAME_IMPERFECT_SOUND )
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index e32fd2561c4..8b8609ff061 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -872,53 +872,53 @@ const game_driver * const drivers[] =
 	DRIVER( cosmicg )	/* 7907 (c) 1979 */
 	DRIVER( cosmica )	/* 7910 (c) [1979] */
 	DRIVER( cosmica2 )	/* 7910 (c) 1979 */
-	DRIVER( panic )		/* (c) 1980 */
-	DRIVER( panic2 )	/* (c) 1980 */
-	DRIVER( panic3 )	/* (c) 1980 */
-	DRIVER( panich )	/* (c) 1980 */
-	DRIVER( panicger )	/* (c) 1980 */
+	DRIVER( nomnlnd )	/* 8003 (c) [1980?] */
+	DRIVER( nomnlndg )	/* 8003 (c) [1980?] + Gottlieb */
+	DRIVER( magspot )	/* ???? (c) [1980] */
+	DRIVER( magspot2 )	/* 8013 (c) [1980] */
+	DRIVER( panic )		/* 8015 (c) 1980 */
+	DRIVER( panic2 )	/* 8015 (c) 1980 */
+	DRIVER( panic3 )	/* 8015 (c) 1980 */
+	DRIVER( panich )	/* 8015 (c) 1980 */
+	DRIVER( panicger )	/* 8015 (c) 1980 */
+	DRIVER( devzone )	/* 8022 (c) [1980] */
+	DRIVER( devzone2 )	/* 8022 (c) [1980] */
+	DRIVER( cheekyms )	/* 8004 (c) [1980?] */
 	DRIVER( zerohour )	/* 8011 (c) Universal */
 	DRIVER( redclash )	/* (c) 1981 Tehkan */
 	DRIVER( redclsha )	/* (c) 1981 Tehkan */
 	DRIVER( redclask )	/* (c) Kaneko (bootleg?) */
-	DRIVER( magspot )	/* ???? (c) [1980] */
-	DRIVER( magspot2 )	/* 8013 (c) [1980] */
-	DRIVER( devzone )	/* 8022 (c) [1980] */
-	DRIVER( devzone2 )	/* 8022 (c) [1980] */
-	DRIVER( nomnlnd )	/* (c) [1980?] */
-	DRIVER( nomnlndg )	/* (c) [1980?] + Gottlieb */
-	DRIVER( cheekyms )	/* (c) [1980?] */
-	DRIVER( ladybug )	/* (c) 1981 */
+	DRIVER( cavenger )	/* 8106 (c) 1981 */
+	DRIVER( ladybug )	/* 8110 (c) 1981 */
 	DRIVER( ladybugb )	/* bootleg */
 	DRIVER( ladybgb2 )	/* bootleg */
-	DRIVER( snapjack )	/* (c) */
-	DRIVER( sraider )	/* (c) 1982 Universal */
-	DRIVER( cavenger )	/* (c) 1981 */
+	DRIVER( snapjack )	/* ???? (c) */
+	DRIVER( sraider )	/* ???? (c) 1982 Universal */
 	DRIVER( dorodon )	/* Falcon */
 	DRIVER( dorodon2 )	/* Falcon */
-	DRIVER( mrdo )		/* (c) 1982 */
-	DRIVER( mrdoy )		/* (c) 1982 */
-	DRIVER( mrdot )		/* (c) 1982 + Taito license */
-	DRIVER( mrdofix )	/* (c) 1982 + Taito license */
+	DRIVER( mrdo )		/* 8201 (c) 1982 */
+	DRIVER( mrdoy )		/* 8201 (c) 1982 */
+	DRIVER( mrdot )		/* 8201 (c) 1982 + Taito license */
+	DRIVER( mrdofix )	/* 8201 (c) 1982 + Taito license */
 	DRIVER( mrlo )		/* bootleg */
 	DRIVER( mrdu )		/* bootleg */
 	DRIVER( yankeedo )	/* bootleg */
-	DRIVER( docastle )	/* (c) 1983 */
-	DRIVER( docastl2 )	/* (c) 1983 */
-	DRIVER( docastlo )	/* (c) 1983 */
-	DRIVER( douni )		/* (c) 1983 */
-	DRIVER( dorunrun )	/* (c) 1984 */
-	DRIVER( dorunru2 )	/* (c) 1984 */
-	DRIVER( dorunruc )	/* (c) 1984 */
-	DRIVER( dorunrca )	/* (c) 1984 */
-	DRIVER( spiero )	/* (c) 1987 */
-	DRIVER( dowild )	/* (c) 1984 */
-	DRIVER( jjack )		/* (c) 1984 */
-	DRIVER( kickridr )	/* (c) 1984 */
-	DRIVER( idsoccer )	/* (c) 1985 */
-	DRIVER( superdq )	/* (c) 1984 */
-	DRIVER( superdqs )	/* (c) 1984 */
-	DRIVER( superdqa )	/* (c) 1984 */
+	DRIVER( docastle )	/* 8302 (c) 1983 */
+	DRIVER( docastl2 )	/* 8302 (c) 1983 */
+	DRIVER( docastlo )	/* 8302 (c) 1983 */
+	DRIVER( douni )		/* 8302 (c) 1983 */
+	DRIVER( dorunrun )	/* ???? (c) 1984 */
+	DRIVER( dorunru2 )	/* ???? (c) 1984 */
+	DRIVER( dorunruc )	/* ???? (c) 1984 */
+	DRIVER( dorunrca )	/* ???? (c) 1984 */
+	DRIVER( spiero )	/* ???? (c) 1987 */
+	DRIVER( dowild )	/* ???? (c) 1984 */
+	DRIVER( jjack )		/* ???? (c) 1984 */
+	DRIVER( kickridr )	/* ???? (c) 1984 */
+	DRIVER( idsoccer )	/* ???? (c) 1985 */
+	DRIVER( superdq )	/* ???? (c) 1984 */
+	DRIVER( superdqs )	/* ???? (c) 1984 */
+	DRIVER( superdqa )	/* ???? (c) 1984 */
 
 	/* Nintendo games */
 	DRIVER( spacefev )	/* (c) 1979 Nintendo */