diff --git a/src/emu/sound/sidw6581.h b/src/emu/sound/sidw6581.h
index f7cc6fe5cd5..b37f7693c54 100644
--- a/src/emu/sound/sidw6581.h
+++ b/src/emu/sound/sidw6581.h
@@ -1,4 +1,4 @@
-// license:???
+// license:GPL-2.0+
 // copyright-holders:Dag Lem
 #ifndef WAVE6581_h
 #define WAVE6581_h
diff --git a/src/emu/sound/sidw8580.h b/src/emu/sound/sidw8580.h
index a4d2fc643f7..e1f0c10ec8e 100644
--- a/src/emu/sound/sidw8580.h
+++ b/src/emu/sound/sidw8580.h
@@ -1,4 +1,4 @@
-// license:???
+// license:GPL-2.0+
 // copyright-holders:Dag Lem
 #pragma once
 
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 9c6b1a8e88f..b36b81dc030 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett
+// copyright-holders:Philip Bennett
 /**********************************************************************************************
 
     Taito TC0140SYT
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index 0c798d03b6f..db56671bf7d 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett
+// copyright-holders:Philip Bennett
 #ifndef __TAITOSND_H__
 #define __TAITOSND_H__
 
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index e7de464933d..c09e28ca8b0 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Zsolt Vasvari, Aaron Giles, R. Belmont, Lord Nightmare
+// copyright-holders:Zsolt Vasvari, Aaron Giles, R. Belmont, Jonathan Gevaryahu
 /***************************************************************************
 
     Berzerk hardware
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index 2aa830ca202..082e4a05852 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett
+// copyright-holders:Philip Bennett
 /***************************************************************************
 
     Atari Metal Maniax
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index 2d8a18279ee..8b8fab87261 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:James Wallace, Phil Bennett
+// copyright-holders:James Wallace, Philip Bennett
 /***********************************************************************************************************
 Barcrest MPU4 Extension driver by J.Wallace, Phil Bennett and Anonymous.
 
diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c
index fdcf29741f6..809b84a40d0 100644
--- a/src/mame/drivers/seabattl.c
+++ b/src/mame/drivers/seabattl.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Mariusz Wojcieszek, hap, Phil Bennett, David Haywood
+// copyright-holders:Mariusz Wojcieszek, hap, Philip Bennett, David Haywood
 /*
 
 Sea Battle by Zaccaria
diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h
index b12eeb11a67..382d9514eb5 100644
--- a/src/mame/includes/metalmx.h
+++ b/src/mame/includes/metalmx.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett
+// copyright-holders:Philip Bennett
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms34010/tms34010.h"
diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c
index 241e04e9f33..97b5524b16c 100644
--- a/src/mame/machine/namco62.c
+++ b/src/mame/machine/namco62.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett, Andrew Gardner
+// copyright-holders:Philip Bennett, Andrew Gardner
 /***************************************************************************
 
     Namco 62XX
diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h
index 50814b9f8a0..91a63022857 100644
--- a/src/mame/machine/namco62.h
+++ b/src/mame/machine/namco62.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Phil Bennett, Andrew Gardner
+// copyright-holders:Philip Bennett, Andrew Gardner
 #ifndef NAMCO62_H
 #define NAMCO62_H
 
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index f90ba98f494..57ef5f8bbf3 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Paul "TBBle" Hampson
+// copyright-holders:Paul Hampson
 /***************************************************************************
 
   Video Hardware for Championship V'ball by Paul Hampson
diff --git a/src/mess/drivers/tdv2324.c b/src/mess/drivers/tdv2324.c
index bff59b14dcd..09a69054036 100644
--- a/src/mess/drivers/tdv2324.c
+++ b/src/mess/drivers/tdv2324.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Curt Coder,Lord Nightmare
+// copyright-holders:Curt Coder,Jonathan Gevaryahu
 /*
 
     Tandberg TDV2324
diff --git a/src/mess/drivers/tispeak.c b/src/mess/drivers/tispeak.c
index b3e2e06ef7b..dd7aeeedd15 100644
--- a/src/mess/drivers/tispeak.c
+++ b/src/mess/drivers/tispeak.c
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:hap, Lord Nightmare
+// copyright-holders:hap, Jonathan Gevaryahu
 /***************************************************************************
 
   ** subclass of hh_tms1k_state (includes/hh_tms1k.h, drivers/hh_tms1k.c) **
diff --git a/src/mess/includes/tdv2324.h b/src/mess/includes/tdv2324.h
index fc76ea8e022..7a2aaf91a22 100644
--- a/src/mess/includes/tdv2324.h
+++ b/src/mess/includes/tdv2324.h
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Curt Coder,Lord Nightmare
+// copyright-holders:Curt Coder,Jonathan Gevaryahu
 #pragma once
 
 #ifndef __TDV2324__