diff --git a/src/f_wipe.cpp b/src/f_wipe.cpp
index ea5a4899329c9d86931ba5af4061573c289ce86e..f553aafa6bfeb6fcecee2aef5d586cfbec2e963c 100644
--- a/src/f_wipe.cpp
+++ b/src/f_wipe.cpp
@@ -2,7 +2,7 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2000 by DooM Legacy Team.
 // Copyright (C) 1996 by id Software, Inc.
 //
diff --git a/src/k_menu.h b/src/k_menu.h
index f12cddeb3f782dd15f0f25dc392c853280d30afb..47a92f58bb4c42fff3b1edce5066d494823eb86f 100644
--- a/src/k_menu.h
+++ b/src/k_menu.h
@@ -1,7 +1,7 @@
 // DR. ROBOTNIK'S RING RACERS
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Kart Krew.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2020 by Sonic Team Junior.
 // Copyright (C) 2000 by DooM Legacy Team.
 // Copyright (C) 1996 by id Software, Inc.
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 3106d8e14b254749568aacbdac0f58e5db5bc316..5fd50d5623d7315cc57794596dcb8b8eaa7a145e 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -1,7 +1,7 @@
 // DR. ROBOTNIK'S RING RACERS
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Kart Krew.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2020 by Sonic Team Junior.
 //
 // This program is free software distributed under the
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 316efd511ba2b75be30f458e75d22fd72375ceaa..6188400242c863b08aa1e6b95f256dda9baf8182 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -1,7 +1,7 @@
 // DR. ROBOTNIK'S RING RACERS
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Kart Krew.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2020 by Sonic Team Junior.
 //
 // This program is free software distributed under the
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 08cac979d0749821a26ed3341773981449d88dd3..3e504cfeb8bc9fcfac2f496f95062c23610a6411 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -1,8 +1,8 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
-// Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 2013      by "Ninji".
-// Copyright (C) 2013-2020 by Sonic Team Junior.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
+// Copyright (C) 2013 by "Ninji".
+// Copyright (C) 2020 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
diff --git a/src/m_anigif.h b/src/m_anigif.h
index 34f149a8832c5a3bc5af481dc5bffe30efa0d32a..ea8fd0caf2f8fa6a42c63d62dd2712f5ecbfb1ca 100644
--- a/src/m_anigif.h
+++ b/src/m_anigif.h
@@ -1,7 +1,7 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
-// Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 2013-2020 by Sonic Team Junior.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire
+// Copyright (C) 2020 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
diff --git a/src/m_cond.c b/src/m_cond.c
index d257182329f67c00b8f2e315136db0ee04230afd..3bfdc6b65075c3991edf6e57db5922b9a610acd0 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -3,7 +3,7 @@
 // Copyright (C) 2024 by Vivian "toastergrl" Grannell.
 // Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
diff --git a/src/m_cond.h b/src/m_cond.h
index f71bacfa1602ba548c0b2da7a646430c90632cde..42e7184a900f4031129a1b014aeac6560ff8c582 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -3,7 +3,7 @@
 // Copyright (C) 2024 by Vivian "toastergrl" Grannell.
 // Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
diff --git a/src/m_random.c b/src/m_random.c
index 4ff982d9794da0fa16a2d248f136021728305fd8..36d8582aba246f09465cb04beb41ab2a87331750 100644
--- a/src/m_random.c
+++ b/src/m_random.c
@@ -3,7 +3,7 @@
 // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour.
 // Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2000 by DooM Legacy Team.
 // Copyright (C) 1996 by id Software, Inc.
 //
diff --git a/src/m_random.h b/src/m_random.h
index 7c98f516c7650c2585328c6acbf37853799f54a1..8d8120f0ee85652edddd88bbfc65491253dc4f61 100644
--- a/src/m_random.h
+++ b/src/m_random.h
@@ -3,7 +3,7 @@
 // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour.
 // Copyright (C) 2024 by Kart Krew.
 // Copyright (C) 2020 by Sonic Team Junior.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2000 by DooM Legacy Team.
 // Copyright (C) 1996 by id Software, Inc.
 //
diff --git a/src/menus/play-online-server-browser.c b/src/menus/play-online-server-browser.c
index 0dde36ba7b994ae42f8a3235124b53f4bcc4ec7f..6798e5174eb7d50f0d1b7376a766290dbadadd5f 100644
--- a/src/menus/play-online-server-browser.c
+++ b/src/menus/play-online-server-browser.c
@@ -1,7 +1,7 @@
 // DR. ROBOTNIK'S RING RACERS
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Kart Krew.
-// Copyright (C) 2016 by Matthew "Kaito Sinclaire" Walsh.
+// Copyright (C) 2016 by Kay "Kaito" Sinclaire.
 // Copyright (C) 2020 by Sonic Team Junior.
 //
 // This program is free software distributed under the