diff --git a/src/emu/sound/disc_cls.h b/src/emu/sound/disc_cls.h
index 267a099bcc4..255b0958c15 100644
--- a/src/emu/sound/disc_cls.h
+++ b/src/emu/sound/disc_cls.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins, Derrick Renaud, F.Palazzolo, Couriersud
+// copyright-holders:K.Wilkins, Derrick Renaud, F.Palazzolo, Couriersud
 #pragma once
 
 #ifndef __DISC_CLS_H__
@@ -9,7 +9,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_dev.h b/src/emu/sound/disc_dev.h
index f2103746429..9d06384f9e0 100644
--- a/src/emu/sound/disc_dev.h
+++ b/src/emu/sound/disc_dev.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 #pragma once
 
 #ifndef __DISC_DEV_H__
@@ -9,7 +9,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_dev.inc b/src/emu/sound/disc_dev.inc
index dbf4c37d116..7ff2c25aac8 100644
--- a/src/emu/sound/disc_dev.inc
+++ b/src/emu/sound/disc_dev.inc
@@ -2,7 +2,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@dysfunction.demon.co.uk)
+ *  Written by K.Wilkins (mame@dysfunction.demon.co.uk)
  *
  *  (c) K.Wilkins 2000
  *  (c) Derrick Renaud 2003-2004
diff --git a/src/emu/sound/disc_flt.h b/src/emu/sound/disc_flt.h
index ab2871e2c4c..6067e722b10 100644
--- a/src/emu/sound/disc_flt.h
+++ b/src/emu/sound/disc_flt.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 #pragma once
 
 #ifndef __DISC_FLTH__
@@ -9,7 +9,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_flt.inc b/src/emu/sound/disc_flt.inc
index 4edda799999..fc95db8c481 100644
--- a/src/emu/sound/disc_flt.inc
+++ b/src/emu/sound/disc_flt.inc
@@ -2,7 +2,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_inp.inc b/src/emu/sound/disc_inp.inc
index 98fabfa7bf8..65a9ce1d78d 100644
--- a/src/emu/sound/disc_inp.inc
+++ b/src/emu/sound/disc_inp.inc
@@ -2,7 +2,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_mth.h b/src/emu/sound/disc_mth.h
index 411ad94720f..3168a190723 100644
--- a/src/emu/sound/disc_mth.h
+++ b/src/emu/sound/disc_mth.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 #pragma once
 
 #ifndef __DISC_MTH_H__
@@ -9,7 +9,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_mth.inc b/src/emu/sound/disc_mth.inc
index 8b743cc0b9e..feabf67d3a8 100644
--- a/src/emu/sound/disc_mth.inc
+++ b/src/emu/sound/disc_mth.inc
@@ -2,7 +2,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *  (c) Derrick Renaud 2003-2004
diff --git a/src/emu/sound/disc_sys.inc b/src/emu/sound/disc_sys.inc
index 6afabd62b0f..729048a21f7 100644
--- a/src/emu/sound/disc_sys.inc
+++ b/src/emu/sound/disc_sys.inc
@@ -2,7 +2,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *  (c) Derrick Renaud 2003-2004
diff --git a/src/emu/sound/disc_wav.h b/src/emu/sound/disc_wav.h
index 41265415280..d042f0e77b7 100644
--- a/src/emu/sound/disc_wav.h
+++ b/src/emu/sound/disc_wav.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 #pragma once
 
 #ifndef __DISC_WAV_H__
@@ -9,7 +9,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/disc_wav.inc b/src/emu/sound/disc_wav.inc
index c73e721a754..0ad4e93d475 100644
--- a/src/emu/sound/disc_wav.inc
+++ b/src/emu/sound/disc_wav.inc
@@ -1,7 +1,7 @@
 /************************************************************************
  *
  *  MAME - Discrete sound system emulation library
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 2f57cc39ad5..61f3ea35242 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -1,10 +1,10 @@
 // license:???
-// copyright-holders:Keith Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud
+// copyright-holders:K.Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud
 /************************************************************************
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index b2dc39e5ab9..a7dff7c7ff7 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud
+// copyright-holders:K.Wilkins, Derrick Renaud, Frank Palazzolo, Couriersud
 #pragma once
 
 #ifndef __DISCRETE_H__
@@ -11,7 +11,7 @@
  *
  *  MAME - Discrete sound system emulation library
  *
- *  Written by Keith Wilkins (mame@esplexo.co.uk)
+ *  Written by K.Wilkins (mame@esplexo.co.uk)
  *
  *  (c) K.Wilkins 2000
  *
diff --git a/src/mame/audio/llander.c b/src/mame/audio/llander.c
index c21b670b970..eb7aaaa0620 100644
--- a/src/mame/audio/llander.c
+++ b/src/mame/audio/llander.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
     Lunar Lander Specific Sound Code
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 622461e1375..75345ad3a5b 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
 Namco System II driver by K.Wilkins  (Jun1998, Oct1999)
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 7cf29cf0424..4d3ac98f999 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 840f6e17b0b..8b943a1a780 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
   namcos2.h
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index f00efa58c02..6d78fa031ea 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 05d603e1dd1..aa0b123d67f 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
 Namco System II
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index cab3a7ed172..e65f129db7e 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
   Toaplan Slap Fight hardware
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index 1fecb98a282..e84c8784ffa 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /* video hardware for Namco System II */
 
 #include "emu.h"
diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c
index 2ea69ff161a..e56764d9cb2 100644
--- a/src/mame/video/slapfght.c
+++ b/src/mame/video/slapfght.c
@@ -1,5 +1,5 @@
 // license:???
-// copyright-holders:Keith Wilkins
+// copyright-holders:K.Wilkins
 /***************************************************************************
 
   Toaplan Slap Fight hardware