diff --git a/src/f_wipe.cpp b/src/f_wipe.cpp
index ea5a48993..f553aafa6 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 f12cddeb3..47a92f58b 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 3106d8e14..5fd50d562 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 316efd511..618840024 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 08cac979d..3e504cfeb 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 34f149a88..ea8fd0caf 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 d25718232..3bfdc6b65 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 f71bacfa1..42e7184a9 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 4ff982d97..36d8582ab 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 7c98f516c..8d8120f0e 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 0dde36ba7..6798e5174 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