diff --git a/CREDITS.md b/CREDITS.md
index 0d13cc0a3..d178cd555 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -6,40 +6,40 @@
 ## Creator of MineClone2
 * Wuzzy
 
-
 ## Maintainers
 * AncientMariner
 * Nicu
 
 ## Previous Maintainers
 * Fleckenstein
-* jordan4ibanez
 * cora
 
 ## Developers
-* bzoss
 * AFCMS
 * epCode
-* ryvnf
-* iliekprogrammar
-* MysticTempest
-* Rootyjr
-* aligator
-* Code-Sploit
-* NO11
-* kabou
-* rudzik8
 * chmodsayshello
 * PrairieWind
-* RandomLegoBrick
-* SumianVoice
 * MrRar
-* talamh
-* Faerraven / Michieal
 * FossFanatic 
 * SmokeyDope
 
+## Past Developers
+* iliekprogrammar
+* kabou
+* Faerraven / Michieal
+* MysticTempest
+* NO11
+* SumianVoice
+
 ## Contributors
+* RandomLegoBrick
+* rudzik8
+* Code-Sploit
+* aligator
+* Rootyjr
+* ryvnf
+* bzoss
+* talamh
 * Laurent Rocher
 * HimbeerserverDE
 * TechDudie
@@ -68,6 +68,11 @@
 * Marcin Serwin
 * erlehmann
 * E
+* n_to
+* kay27
+* Debiankaios
+* Gustavo6046 / wallabra
+* CableGuy67
 * Benjamin Schötz
 * Doloment
 * Sydney Gems
@@ -106,24 +111,12 @@
 * Niterux
 * appgurueu
 
-## MineClone5
-* kay27
-* Debiankaios
-* epCode
-* NO11
-* j45
-* chmodsayshello
-* 3raven
-* PrairieWind
-* Gustavo6046 / wallabra
-* CableGuy67
-* MrRar
-
-## Mineclonia
-* erlehmann
-* Li0n
-* E
-* n_to
+## Music
+* Jordach for the jukebox music compilation from Big Freaking Dig
+* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
+* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
+* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
+* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
 
 ## Original Mod Authors
 * Wuzzy
@@ -207,12 +200,6 @@
 * Cora
 
 ## Special thanks
-* celeron55 for creating Minetest
-* Jordach for the jukebox music compilation from Big Freaking Dig
-* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
+* The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible
 * The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
-* Notch and Jeb for being the major forces behind Minecraft
-* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
-* Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)
-* Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)
-* Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)
+* Notch and Jeb for being the major forces behind Minecraft
\ No newline at end of file
diff --git a/mods/HUD/mcl_credits/people.lua b/mods/HUD/mcl_credits/people.lua
index 1347da05b..9e2a2e488 100644
--- a/mods/HUD/mcl_credits/people.lua
+++ b/mods/HUD/mcl_credits/people.lua
@@ -14,33 +14,34 @@ return {
 	}},
 	{S("Previous Maintainers"), 0xFFFFFF, {
 		"Fleckenstein",
-		"jordan4ibanez",
 		"cora",
 	}},
 	{S("Developers"), 0xF84355, {
-		"bzoss",
 		"AFCMS",
 		"epCode",
-		"ryvnf",
-		"iliekprogrammar",
-		"MysticTempest",
-		"Rootyjr",
-		"aligator",
-		"Code-Sploit",
-		"NO11",
-		"kabou",
-		"rudzik8",
 		"chmodsayshello",
 		"PrairieWind",
-		"RandomLegoBrick",
-		"SumianVoice",
 		"MrRar",
-		"talamh",
-		"Faerraven / Michieal",
 		"FossFanatic ",
 		"SmokeyDope",
 	}},
+	{S("Past Developers"), 0xF84355, {
+		"iliekprogrammar",
+		"kabou",
+		"Faerraven / Michieal",
+		"MysticTempest",
+		"NO11",
+		"SumianVoice",
+	}},
 	{S("Contributors"), 0x52FF00, {
+		"RandomLegoBrick",
+		"rudzik8",
+		"Code-Sploit",
+		"aligator",
+		"Rootyjr",
+		"ryvnf",
+		"bzoss",
+		"talamh",
 		"Laurent Rocher",
 		"HimbeerserverDE",
 		"TechDudie",
@@ -69,6 +70,11 @@ return {
 		"Marcin Serwin",
 		"erlehmann",
 		"E",
+		"n_to",
+		"kay27",
+		"Debiankaios",
+		"Gustavo6046 / wallabra",
+		"CableGuy67",
 		"Benjamin Schötz",
 		"Doloment",
 		"Sydney Gems",
@@ -107,24 +113,12 @@ return {
 		"Niterux",
 		"appgurueu",
 	}},
-	{S("MineClone5"), 0xA60014, {
-		"kay27",
-		"Debiankaios",
-		"epCode",
-		"NO11",
-		"j45",
-		"chmodsayshello",
-		"3raven",
-		"PrairieWind",
-		"Gustavo6046 / wallabra",
-		"CableGuy67",
-		"MrRar",
-	}},
-	{S("Mineclonia"), 0xFFFFFF, {
-		"erlehmann",
-		"Li0n",
-		"E",
-		"n_to",
+	{S("Music"), 0xA60014, {
+		"Jordach for the jukebox music compilation from Big Freaking Dig",
+		"Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/",
+		"Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)",
+		"Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)",
+		"Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)",
 	}},
 	{S("Original Mod Authors"), 0x343434, {
 		"Wuzzy",
@@ -208,14 +202,8 @@ return {
 		"Cora",
 	}},
 	{S("Special thanks"), 0x00E9FF, {
-		"celeron55 for creating Minetest",
-		"Jordach for the jukebox music compilation from Big Freaking Dig",
-		"wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.",
+		"The Minetest team for making and supporting an engine, and distribution infrastructure that makes this all possible",
 		"The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game",
 		"Notch and Jeb for being the major forces behind Minecraft",
-		"Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube) and Traitor (horizonchris96), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/",
-		"Jester for helping to finely tune MineClone2 (https://www.youtube.com/@Jester-8-bit). Songs: Hailing Forest, Gift, 0dd BL0ck, Flock of One (License CC BY-SA 4.0)",
-		"Exhale & Tim Unwin for some wonderful MineClone2 tracks (https://www.youtube.com/channel/UClFo_JDWoG4NGrPQY0JPD_g). Songs: Valley of Ghosts, Lonely Blossom, Farmer (License CC BY-SA 4.0)",
-		"Diminixed for 3 fantastic tracks and remastering and leveling volumes. Songs: Afternoon Lullaby (pianowtune02), Spooled (ambientwip02), Never Grow Up (License CC BY-SA 4.0)",
 	}},
 }
diff --git a/tools/generate_ingame_credits.lua b/tools/generate_ingame_credits.lua
index db124aaf6..a484322c0 100755
--- a/tools/generate_ingame_credits.lua
+++ b/tools/generate_ingame_credits.lua
@@ -7,8 +7,9 @@ local colors = {
 	["Creator of MineClone2"] = "0xFBF837",
 	["Maintainers"] = "0xFF51D5",
 	["Developers"] = "0xF84355",
+	["Past Developers"] = "0xF84355",
 	["Contributors"] = "0x52FF00",
-	["MineClone5"] = "0xA60014",
+	["Music"] = "0xA60014",
 	["Original Mod Authors"] = "0x343434",
 	["3D Models"] = "0x0019FF",
 	["Textures"] = "0xFF9705",